Update some tests

diff --git a/test/asdf-pathname-test.script b/test/asdf-pathname-test.script
index d849121..e0d71ff 100644 (file)
--- a/test/asdf-pathname-test.script
+++ b/test/asdf-pathname-test.script
@@ -329,11 +329,11 @@
      ;; we're testing with unix, are we not?
      (x (resolve-location '(:home)) (truename (user-homedir-pathname)))
      (x (resolve-location '("/foo" "bar" "baz")) #p"/foo/bar/baz")
-     (x (resolve-location '("/foo" "bar" "baz") :want-directory t) #p"/foo/bar/baz/")
-     (x (resolve-location '("/foo" "bar" "baz") :want-directory t :wilden t) (wilden #p"/foo/bar/baz/"))
-     (x (resolve-location '("/foo" "bar" "baz") :want-directory nil :wilden t) (wilden #p"/foo/bar/"))
+     (x (resolve-location '("/foo" "bar" "baz") :ensure-directory t) #p"/foo/bar/baz/")
+     (x (resolve-location '("/foo" "bar" "baz") :ensure-directory t :wilden t) (wilden #p"/foo/bar/baz/"))
+     (x (resolve-location '("/foo" "bar" "baz") :ensure-directory nil :wilden t) (wilden #p"/foo/bar/"))
      #-gcl
-     (x (resolve-location '("/foo" "bar" :**/ "baz" #p"*.*") :want-directory nil :wilden t) #p"/foo/bar/**/baz/*.*")))
+     (x (resolve-location '("/foo" "bar" :**/ "baz" #p"*.*") :ensure-directory nil :wilden t) #p"/foo/bar/**/baz/*.*")))
 
  #-(or xcl gcl<2.7) ;;---*** pathnames are known to be massively broken on XCL and GCL 2.6
  (or (test-component-pathnames :delete-host t :support-string-pathnames nil)

diff --git a/test/hello-world-example.asd b/test/hello-world-example.asd
index 5155969..b8e244a 100644 (file)
--- a/test/hello-world-example.asd
+++ b/test/hello-world-example.asd
@@ -1,7 +1,8 @@
 ;; Example executable program
 
 (defsystem :hello-world-example
-  :class :program-system
+  :class :bundle-system
+  :build-operation program-op
   :entry-point "hello:main"
   :depends-on (:asdf-driver)
   :translate-output-p nil

diff --git a/test/test-utilities.script b/test/test-utilities.script
index 47a0708..ef4d643 100644 (file)
--- a/test/test-utilities.script
+++ b/test/test-utilities.script
@@ -26,17 +26,17 @@
 ;; These are funky and non portable, omit from tests:
 ;; (make-pathname* :name "." :type nil :directory '(:absolute "tmp"))
 ;; (make-pathname* :name "." :type "" :directory '(:absolute "tmp"))
-(assert (equal (multiple-value-list (split-unix-namestring-directory-components "" :want-directory t))
+(assert (equal (multiple-value-list (split-unix-namestring-directory-components "" :ensure-directory t))
                '(:relative nil nil nil)))
-(assert (equal (multiple-value-list (split-unix-namestring-directory-components ""  :want-directory nil))
+(assert (equal (multiple-value-list (split-unix-namestring-directory-components ""  :ensure-directory nil))
                '(:relative nil nil nil)))
-(assert (equal (multiple-value-list (split-unix-namestring-directory-components "/" :want-directory t))
+(assert (equal (multiple-value-list (split-unix-namestring-directory-components "/" :ensure-directory t))
                '(:absolute nil nil nil)))
-(assert (equal (multiple-value-list (split-unix-namestring-directory-components "/" :want-directory nil))
+(assert (equal (multiple-value-list (split-unix-namestring-directory-components "/" :ensure-directory nil))
                '(:absolute nil nil nil)))
-(assert (equal (multiple-value-list (split-unix-namestring-directory-components "/aa/ba" :want-directory t))
+(assert (equal (multiple-value-list (split-unix-namestring-directory-components "/aa/ba" :ensure-directory t))
                '(:absolute ("aa" "ba") nil nil)))
-(assert (equal (multiple-value-list (split-unix-namestring-directory-components "/aa/ba" :want-directory nil))
+(assert (equal (multiple-value-list (split-unix-namestring-directory-components "/aa/ba" :ensure-directory nil))
                '(:absolute ("aa") "ba" nil)))
 (assert
  (version-satisfies (asdf-version) (asdf-version)))
@@ -48,13 +48,13 @@
  (mapcar 'namestring (split-native-pathnames-string "foo:bar"))
  '("foo" "bar"))
 (assert-equal
- (mapcar 'namestring (split-native-pathnames-string "foo:bar" :want-directory t))
+ (mapcar 'namestring (split-native-pathnames-string "foo:bar" :ensure-directory t))
  '("foo/" "bar/"))
 (assert-equal
  (mapcar 'namestring (split-native-pathnames-string "/foo:/bar" :want-absolute t))
  '("/foo" "/bar"))
 (assert-equal
- (mapcar 'namestring (split-native-pathnames-string "/foo:/bar" :want-absolute t :want-directory t))
+ (mapcar 'namestring (split-native-pathnames-string "/foo:/bar" :want-absolute t :ensure-directory t))
  '("/foo/" "/bar/"))
 (assert-equal
  (mapcar 'location-function-p