From 202306077346d7091104a5a1b13250a7ebcd3279 Mon Sep 17 00:00:00 2001
From: Francois-Rene Rideau <tunes@google.com>
Date: Sun, 24 Feb 2013 18:05:36 -0500
Subject: [PATCH] Tweak tests to work for Robert Goldman.

Make test-utilities work on lower-case lisps.
Don't assume ln is in /bin. Don't assume SHELL is /bin/sh.
---
 test/run-tests.sh            |   2 +
 test/test-multiple.script    |   9 +--
 test/test-run-program.script |   2 -
 test/test-utilities.script   | 140 +++++++++++++++++------------------
 4 files changed, 74 insertions(+), 79 deletions(-)

diff --git a/test/run-tests.sh b/test/run-tests.sh
index 61244645..85acf09a 100755
--- a/test/run-tests.sh
+++ b/test/run-tests.sh
@@ -23,6 +23,8 @@ usage () {
 }
 
 unset DEBUG_ASDF_TEST upgrade clean_load load_systems test_interactively
+SHELL=/bin/sh
+export SHELL
 
 while getopts "cdthulhu" OPTION
 do
diff --git a/test/test-multiple.script b/test/test-multiple.script
index e3cf6979..a94fa3f7 100644
--- a/test/test-multiple.script
+++ b/test/test-multiple.script
@@ -1,20 +1,15 @@
 ;;; -*- Lisp -*-
 
-
-
-(in-package :asdf)
-(use-package :asdf-test)
-
 (defparameter asd (subpathname *test-directory* "test-multiple.asd"))
 (defparameter tmp (subpathname *test-directory* "../build/"))
 (defparameter asd2 (subpathname tmp "test-multiple-too.asd"))
 (defparameter file4 (test-fasl "file4"))
 (setf *central-registry* `(,*test-directory* ,tmp))
 (run-program
- (format nil "/bin/ln -sf ~A ~A 2>&1"
+ (format nil "ln -sf ~A ~A"
          (native-namestring asd)
          (native-namestring asd2)))
 (oos 'load-source-op 'test-multiple-too)
-(assert (symbol-value (find-symbol* :*file3* :test-package)))
+(assert (asymval :*file3* :test-package))
 (load-system 'test-multiple-free)
 (assert (probe-file* file4))
diff --git a/test/test-run-program.script b/test/test-run-program.script
index a242ec4f..606f8580 100644
--- a/test/test-run-program.script
+++ b/test/test-run-program.script
@@ -1,5 +1,3 @@
-#+xcvb
-
 (declaim (optimize (debug 3) (safety 3)))
 
 (assert-equal '("ok 1") (run-program "echo ok 1" :output :lines))
diff --git a/test/test-utilities.script b/test/test-utilities.script
index ed3c4523..971543e8 100644
--- a/test/test-utilities.script
+++ b/test/test-utilities.script
@@ -76,80 +76,80 @@
 
 (defparameter *ok-symbols*
   '(;; slots names
-    ASDF/ACTION:ACCEPT
-    ASDF/ACTION:ACTION
-    ASDF/ACTION:DONE-P
-    ASDF/ACTION:FEATURE
-    ASDF/ACTION:STAMP
-    ASDF/BUNDLE:PROLOGUE-CODE
-    ASDF/BUNDLE:BUILD-ARGS
-    ASDF/BUNDLE:EPILOGUE-CODE
-    ASDF/BUNDLE:NAME-SUFFIX
-    ASDF/COMPONENT:ABSOLUTE-PATHNAME
-    ASDF/COMPONENT:AROUND-COMPILE
-    ASDF/COMPONENT:AUTHOR
-    ASDF/COMPONENT:CHILDREN
-    ASDF/COMPONENT:CHILDREN-BY-NAME
-    ASDF/COMPONENT:COMPONENTS
-    ASDF/COMPONENT:COMPONENTS-BY-NAME
-    ASDF/COMPONENT:DEFAULT-COMPONENT-CLASS
-    ASDF/COMPONENT:DEFSYSTEM-DEPENDS-ON
-    ASDF/COMPONENT:DESCRIPTION
-    ASDF/COMPONENT:%ENCODING
-    ASDF/COMPONENT:IF-FEATURE
-    ASDF/COMPONENT:INLINE-METHODS
-    ASDF/COMPONENT:IN-ORDER-TO
-    ASDF/COMPONENT:LICENCE
-    ASDF/COMPONENT:LONG-DESCRIPTION
-    ASDF/COMPONENT:MAINTAINER
-    ASDF/COMPONENT:NAME
-    ASDF/COMPONENT:OPERATION-TIMES
-    ASDF/COMPONENT:PARENT
-    ASDF/COMPONENT:PROPERTIES
-    ASDF/COMPONENT:RELATIVE-PATHNAME
-    ASDF/COMPONENT:SIBLING-DEPENDENCIES
-    ASDF/COMPONENT:VERSION
-    ASDF/LISP-ACTION:FLAGS
-    ASDF/PLAN:INDEX
-    ASDF/PLAN:FORCED
-    ASDF/PLAN:FORCED-NOT
-    ASDF/PLAN:PLANNED-ACTION-COUNT
-    ASDF/PLAN:PLANNED-OUTPUT-ACTION-COUNT
-    ASDF/PLAN:PLANNED-P
-    ASDF/PLAN:TOTAL-ACTION-COUNT
-    ASDF/PLAN:VISITED-ACTIONS
-    ASDF/PLAN:VISITING-ACTION-SET
-    ASDF/PLAN:VISITING-ACTION-LIST
-    ASDF/SYSTEM:BUG-TRACKER
-    ASDF/SYSTEM:BUILD-PATHNAME
-    ASDF/SYSTEM:ENTRY-POINT
-    ASDF/SYSTEM:HOMEPAGE
-    ASDF/SYSTEM:LONG-NAME
-    ASDF/SYSTEM:MAILTO
-    ASDF/SYSTEM:SOURCE-CONTROL
+    asdf/action:accept
+    asdf/action:action
+    asdf/action:done-p
+    asdf/action:feature
+    asdf/action:stamp
+    asdf/bundle:prologue-code
+    asdf/bundle:build-args
+    asdf/bundle:epilogue-code
+    asdf/bundle:name-suffix
+    asdf/component:absolute-pathname
+    asdf/component:around-compile
+    asdf/component:author
+    asdf/component:children
+    asdf/component:children-by-name
+    asdf/component:components
+    asdf/component:components-by-name
+    asdf/component:default-component-class
+    asdf/component:defsystem-depends-on
+    asdf/component:description
+    asdf/component:%encoding
+    asdf/component:if-feature
+    asdf/component:inline-methods
+    asdf/component:in-order-to
+    asdf/component:licence
+    asdf/component:long-description
+    asdf/component:maintainer
+    asdf/component:name
+    asdf/component:operation-times
+    asdf/component:parent
+    asdf/component:properties
+    asdf/component:relative-pathname
+    asdf/component:sibling-dependencies
+    asdf/component:version
+    asdf/lisp-action:flags
+    asdf/plan:index
+    asdf/plan:forced
+    asdf/plan:forced-not
+    asdf/plan:planned-action-count
+    asdf/plan:planned-output-action-count
+    asdf/plan:planned-p
+    asdf/plan:total-action-count
+    asdf/plan:visited-actions
+    asdf/plan:visiting-action-set
+    asdf/plan:visiting-action-list
+    asdf/system:bug-tracker
+    asdf/system:build-pathname
+    asdf/system:entry-point
+    asdf/system:homepage
+    asdf/system:long-name
+    asdf/system:mailto
+    asdf/system:source-control
     ;; restarts
-    ASDF/ACTION:ACCEPT
-    ASDF/FIND-COMPONENT:RETRY
-    ASDF/FIND-SYSTEM:COERCE-ENTRY-TO-DIRECTORY
-    ASDF/FIND-SYSTEM:REMOVE-ENTRY-FROM-REGISTRY
-    ASDF/LISP-ACTION:TRY-RECOMPILING
+    asdf/action:accept
+    asdf/find-component:retry
+    asdf/find-system:coerce-entry-to-directory
+    asdf/find-system:remove-entry-from-registry
+    asdf/lisp-action:try-recompiling
     ;; types
-    ASDF/BUNDLE:USER-SYSTEM
+    asdf/bundle:user-system
     ;; on some implementations only
-    ASDF/BUNDLE:BUNDLE-SYSTEM
-    ASDF/BUNDLE:REGISTER-PRE-BUILT-SYSTEM 
-    ASDF/BUNDLE:STATIC-LIBRARY
-    ASDF/IMAGE:CREATE-IMAGE
-    ASDF/IMAGE:DUMP-IMAGE
-    ASDF/LISP-BUILD:REIFY-UNDEFINED-WARNING
-    ASDF/OS:PARSE-FILE-LOCATION-INFO
-    ASDF/OS:PARSE-WINDOWS-SHORTCUT
-    ASDF/OS:READ-LITTLE-ENDIAN
-    ASDF/OS:READ-NULL-TERMINATED-STRING
+    asdf/bundle:bundle-system
+    asdf/bundle:register-pre-built-system 
+    asdf/bundle:static-library
+    asdf/image:create-image
+    asdf/image:dump-image
+    asdf/lisp-build:reify-undefined-warning
+    asdf/os:parse-file-location-info
+    asdf/os:parse-windows-shortcut
+    asdf/os:read-little-endian
+    asdf/os:read-null-terminated-string
     ;; backward compatibility upgrade only
-    ASDF/BACKWARD-INTERNALS:MAKE-SUB-OPERATION
-    ASDF/FIND-SYSTEM:CONTRIB-SYSDEF-SEARCH
-    ASDF/FIND-SYSTEM:SYSDEF-FIND-ASDF
+    asdf/backward-internals:make-sub-operation
+    asdf/find-system:contrib-sysdef-search
+    asdf/find-system:sysdef-find-asdf
     ))
 
 (defun defined-symbol-p (symbol)
-- 
GitLab