From 8da3bfa8048f4d2dba89ffcdc6833a0839715668 Mon Sep 17 00:00:00 2001 From: Francois-Rene Rideau <fare@tunes.org> Date: Thu, 4 Feb 2010 13:26:39 -0500 Subject: [PATCH] Robustify test scripts against there being a directory asdf/ next to asdf.lisp perl -pi.bak -e 's|"../asdf"|\(compile-file-pathname "../asdf"\)|;' *.script --- test/test-force.script | 2 +- test/test-module-pathnames.script | 2 +- test/test-nested-components.script | 2 +- test/test-package.script | 2 +- test/test-retry-loading-component-1.script | 2 +- test/test-static-and-serial.script | 2 +- test/test-touch-system-1.script | 2 +- test/test-touch-system-2.script | 2 +- test/test-try-recompiling-1.script | 2 +- test/test-utilities.script | 2 +- test/test-version.script | 2 +- test/test1.script | 2 +- test/test2.script | 2 +- test/test3.script | 2 +- test/test4.script | 2 +- test/test8.script | 2 +- test/test9.script | 2 +- test/wild-module.script | 4 ++-- 18 files changed, 19 insertions(+), 19 deletions(-) diff --git a/test/test-force.script b/test/test-force.script index d182deae..a4e5bb95 100644 --- a/test/test-force.script +++ b/test/test-force.script @@ -1,6 +1,6 @@ ;;; -*- Lisp -*- (load "script-support") -(load "../asdf") +(load (compile-file-pathname "../asdf")) (quit-on-error (setf asdf:*central-registry* '(*default-pathname-defaults*)) diff --git a/test/test-module-pathnames.script b/test/test-module-pathnames.script index 20516542..d7a19953 100644 --- a/test/test-module-pathnames.script +++ b/test/test-module-pathnames.script @@ -1,6 +1,6 @@ ;;; -*- Lisp -*- (load "script-support") -(load "../asdf") +(load (compile-file-pathname "../asdf")) (quit-on-error (setf asdf:*central-registry* '(*default-pathname-defaults*)) diff --git a/test/test-nested-components.script b/test/test-nested-components.script index d0eed16e..c8983b19 100644 --- a/test/test-nested-components.script +++ b/test/test-nested-components.script @@ -3,7 +3,7 @@ ;;; check that added nesting via modules doesn't confuse ASDF (load "script-support") -(load "../asdf") +(load (compile-file-pathname "../asdf")) (in-package #:common-lisp-user) (quit-on-error diff --git a/test/test-package.script b/test/test-package.script index 7a2031fa..f1f50175 100644 --- a/test/test-package.script +++ b/test/test-package.script @@ -1,7 +1,7 @@ ;;; -*- Lisp -*- (in-package :cl-user) (load "script-support") -(load "../asdf") +(load (compile-file-pathname "../asdf")) (quit-on-error (defun module () 1) (load "test-package.asd") diff --git a/test/test-retry-loading-component-1.script b/test/test-retry-loading-component-1.script index e322be2a..a4f3a6e2 100644 --- a/test/test-retry-loading-component-1.script +++ b/test/test-retry-loading-component-1.script @@ -3,7 +3,7 @@ ;;; test asdf:try-recompiling restart (load "script-support") -(load "../asdf") +(load (compile-file-pathname "../asdf")) ;(trace asdf::find-component) ;(trace asdf:run-shell-command asdf:oos asdf:perform asdf:operate) ;#+allegro diff --git a/test/test-static-and-serial.script b/test/test-static-and-serial.script index ca6769e4..79501147 100644 --- a/test/test-static-and-serial.script +++ b/test/test-static-and-serial.script @@ -1,6 +1,6 @@ ;;; -*- Lisp -*- (load "script-support") -(load "../asdf") +(load (compile-file-pathname "../asdf")) (quit-on-error (setf asdf:*central-registry* '(*default-pathname-defaults*)) diff --git a/test/test-touch-system-1.script b/test/test-touch-system-1.script index 178760d4..250ce9b6 100644 --- a/test/test-touch-system-1.script +++ b/test/test-touch-system-1.script @@ -4,7 +4,7 @@ ;;; system that can be found using *system-definition-search-functions* (load "script-support") -(load "../asdf") +(load (compile-file-pathname "../asdf")) (quit-on-error (flet ((system-load-time (name) (let ((data (asdf::system-registered-p name))) diff --git a/test/test-touch-system-2.script b/test/test-touch-system-2.script index 5657fd6a..cf43f236 100644 --- a/test/test-touch-system-2.script +++ b/test/test-touch-system-2.script @@ -4,7 +4,7 @@ ;;; system that canNOT be found using *system-definition-search-functions* (load "script-support") -(load "../asdf") +(load (compile-file-pathname "../asdf")) (quit-on-error (flet ((system-load-time (name) (let ((data (asdf::system-registered-p name))) diff --git a/test/test-try-recompiling-1.script b/test/test-try-recompiling-1.script index fe71158d..85dbf8d6 100644 --- a/test/test-try-recompiling-1.script +++ b/test/test-try-recompiling-1.script @@ -3,7 +3,7 @@ ;;; test asdf:try-recompiling restart (load "script-support") -(load "../asdf") +(load (compile-file-pathname "../asdf")) (defvar *caught-error* nil) (quit-on-error diff --git a/test/test-utilities.script b/test/test-utilities.script index 66569fa5..5dadd639 100644 --- a/test/test-utilities.script +++ b/test/test-utilities.script @@ -1,6 +1,6 @@ ;;; -*- Lisp -*- (load "script-support") -(load "../asdf") +(load (compile-file-pathname "../asdf")) (in-package :asdf) (cl-user::quit-on-error diff --git a/test/test-version.script b/test/test-version.script index 071f67d5..621e009d 100644 --- a/test/test-version.script +++ b/test/test-version.script @@ -1,6 +1,6 @@ ;;; -*- Lisp -*- (load "script-support") -(load "../asdf") +(load (compile-file-pathname "../asdf")) (setf asdf:*central-registry* '(*default-pathname-defaults*)) (defpackage :test-version-system diff --git a/test/test1.script b/test/test1.script index 0713778b..da3d9d65 100644 --- a/test/test1.script +++ b/test/test1.script @@ -1,6 +1,6 @@ ;;; -*- Lisp -*- (load "script-support") -(load "../asdf") +(load (compile-file-pathname "../asdf")) (quit-on-error (setf asdf:*central-registry* '(*default-pathname-defaults*)) diff --git a/test/test2.script b/test/test2.script index 046b029f..d2c75e98 100644 --- a/test/test2.script +++ b/test/test2.script @@ -1,6 +1,6 @@ ;;; -*- Lisp -*- (load "script-support") -(load "../asdf") +(load (compile-file-pathname "../asdf")) (quit-on-error (format t "test2 1~%") (setf asdf:*central-registry* '(*default-pathname-defaults*)) diff --git a/test/test3.script b/test/test3.script index 03ef637c..3686261f 100644 --- a/test/test3.script +++ b/test/test3.script @@ -2,7 +2,7 @@ #+(or f1 f2) (error "This test cannot run if :f1 or :f2 are on *features*") (load "script-support") -(load "../asdf") +(load (compile-file-pathname "../asdf")) (in-package :asdf) (cl-user::quit-on-error (let ((fasl1 (asdf:compile-file-pathname* (truename "file1.lisp"))) diff --git a/test/test4.script b/test/test4.script index 668f9fb7..d9213413 100644 --- a/test/test4.script +++ b/test/test4.script @@ -1,7 +1,7 @@ ;;; -*- Lisp -*- ;;; -*- Lisp -*- (load "script-support") -(load "../asdf") +(load (compile-file-pathname "../asdf")) (in-package :asdf) (cl-user::quit-on-error (setf asdf:*central-registry* '(*default-pathname-defaults*)) diff --git a/test/test8.script b/test/test8.script index 15207d84..d6338b92 100644 --- a/test/test8.script +++ b/test/test8.script @@ -3,7 +3,7 @@ ;;; make sure we get a missing-component error (load "script-support") -(load "../asdf") +(load (compile-file-pathname "../asdf")) (in-package #:common-lisp-user) (quit-on-error diff --git a/test/test9.script b/test/test9.script index 35cff3c5..eeaf1a80 100644 --- a/test/test9.script +++ b/test/test9.script @@ -3,7 +3,7 @@ ;;; make sure we get a missing-component-of-version error (load "script-support") -(load "../asdf") +(load (compile-file-pathname "../asdf")) (in-package #:common-lisp-user) (quit-on-error diff --git a/test/wild-module.script b/test/wild-module.script index c45a95bf..41724681 100644 --- a/test/wild-module.script +++ b/test/wild-module.script @@ -1,9 +1,9 @@ ;;; -*- Lisp -*- (load "script-support") -(load "../asdf") +(load (compile-file-pathname "../asdf")) (quit-on-error - (load "../asdf") + (load (compile-file-pathname "../asdf")) (load "../wild-modules") (setf asdf:*central-registry* '(*default-pathname-defaults*)) -- GitLab