Commit 1250bbc5 authored by Francois-Rene Rideau's avatar Francois-Rene Rideau

Use truenamize in compile-file-pathname*

Simplify test scripts.
parent f4d73c7e
......@@ -187,7 +187,7 @@
;;;;
(defparameter *asdf-version*
;; the 1+ hair is to ensure that we don't do an inadvertent find and replace
(subseq "VERSION:1.604" (1+ (length "VERSION"))))
(subseq "VERSION:1.605" (1+ (length "VERSION"))))
(defun asdf-version ()
*asdf-version*)
......@@ -2259,7 +2259,9 @@ with a different configuration, so the configuration would be re-read then."
(defun compile-file-pathname* (input-file &rest keys)
(apply-output-translations
(apply #'compile-file-pathname input-file keys)))
(apply #'compile-file-pathname
(truenamize (merge-pathnames (make-pathname :type "lisp") input-file))
keys)))
;;;; -----------------------------------------------------------------
;;;; Windows shortcut support. Based on:
......
(in-package #:common-lisp-user)
(load "test/script-support.lisp")
(load (merge-pathnames "script-support" *load-pathname*))
(cond ((probe-file "asdf.lisp")
(cond ((probe-file *asdf-lisp*)
(ensure-directories-exist *asdf-fasl*)
(multiple-value-bind (result warnings-p errors-p)
;; style warnings shouldn't abort the compilation [2010/02/03:rpg]
(handler-bind ((style-warning
#'(lambda (w)
(princ w *error-output*)
(muffle-warning w))))
(compile-file "asdf.lisp"))
(compile-file *asdf-lisp*
:output-file *asdf-fasl*))
(declare (ignore result))
(cond (warnings-p
;;; ECL gives warnings that it shouldn't!
......@@ -22,4 +24,3 @@
(leave-lisp "ASDF compiled cleanly" 0)))))
(t
(leave-lisp "Testsuite failed: unable to find ASDF source" 3)))
(in-package #:common-lisp-user)
(defvar *asdf-lisp* (truename (merge-pathnames "../asdf.lisp" *load-truename*)))
(defvar *asdf-fasl* (compile-file-pathname (merge-pathnames "tmp/" *asdf-lisp*)))
(defun load-asdf () (load *asdf-fasl*))
#+allegro
(setf excl:*warn-on-nested-reader-conditionals* nil)
......
;;; -*- Lisp -*-
(load "script-support")
(load (compile-file-pathname "../asdf"))
(load-asdf)
(quit-on-error
(setf asdf:*central-registry* '(*default-pathname-defaults*))
(asdf:operate 'asdf:load-op 'test-force)
(let* ((file1 (asdf:compile-file-pathname* (truename "file1.lisp")))
(let* ((file1 (asdf:compile-file-pathname* "file1"))
(file1-date (file-write-date file1)))
(assert file1)
......
;;; -*- Lisp -*-
(load "script-support")
(load (compile-file-pathname "../asdf"))
(load-asdf)
(quit-on-error
(setf asdf:*central-registry* '(*default-pathname-defaults*))
......
......@@ -3,7 +3,7 @@
;;; check that added nesting via modules doesn't confuse ASDF
(load "script-support")
(load (compile-file-pathname "../asdf"))
(load-asdf)
(in-package #:common-lisp-user)
(quit-on-error
......
;;; -*- Lisp -*-
(in-package :cl-user)
(load "script-support")
(load (compile-file-pathname "../asdf"))
(load-asdf)
(quit-on-error
(defun module () 1)
(load "test-package.asd")
......
......@@ -3,7 +3,7 @@
;;; test asdf:try-recompiling restart
(load "script-support")
(load (compile-file-pathname "../asdf"))
(load-asdf)
;(trace asdf::find-component)
;(trace asdf:run-shell-command asdf:oos asdf:perform asdf:operate)
;#+allegro
......
;;; -*- Lisp -*-
(load "script-support")
(load (compile-file-pathname "../asdf"))
(load-asdf)
(quit-on-error
(setf asdf:*central-registry* '(*default-pathname-defaults*))
......
......@@ -4,7 +4,7 @@
;;; system that can be found using *system-definition-search-functions*
(load "script-support")
(load (compile-file-pathname "../asdf"))
(load-asdf)
(quit-on-error
(flet ((system-load-time (name)
(let ((data (asdf::system-registered-p name)))
......
......@@ -4,7 +4,7 @@
;;; system that canNOT be found using *system-definition-search-functions*
(load "script-support")
(load (compile-file-pathname "../asdf"))
(load-asdf)
(quit-on-error
(flet ((system-load-time (name)
(let ((data (asdf::system-registered-p name)))
......
......@@ -3,7 +3,7 @@
;;; test asdf:try-recompiling restart
(load "script-support")
(load (compile-file-pathname "../asdf"))
(load-asdf)
(defvar *caught-error* nil)
(quit-on-error
......
;;; -*- Lisp -*-
(load "script-support")
(load (compile-file-pathname "../asdf"))
(load-asdf)
(in-package :asdf)
(cl-user::quit-on-error
......
;;; -*- Lisp -*-
(load "script-support")
(load (compile-file-pathname "../asdf"))
(load-asdf)
(setf asdf:*central-registry* '(*default-pathname-defaults*))
(defpackage :test-version-system
......
;;; -*- Lisp -*-
(load "script-support")
(load (compile-file-pathname "../asdf"))
(load-asdf)
(quit-on-error
(setf asdf:*central-registry* '(*default-pathname-defaults*))
(asdf:operate 'asdf:load-op 'test1)
;; test that it compiled
(let* ((file1 (asdf:compile-file-pathname* (truename "file1.lisp")))
(file2 (asdf:compile-file-pathname* (truename "file2.lisp")))
(let* ((file1 (asdf:compile-file-pathname* "file1"))
(file2 (asdf:compile-file-pathname* "file2"))
(file1-date (file-write-date file1)))
(format t "~&test1 1: ~S ~S~%" file1 file1-date)
......
;;; -*- Lisp -*-
(load "script-support")
(load (compile-file-pathname "../asdf"))
(load-asdf)
(quit-on-error
(format t "test2 1~%")
(setf asdf:*central-registry* '(*default-pathname-defaults*))
......
......@@ -2,7 +2,7 @@
#+(or f1 f2)
(error "This test cannot run if :f1 or :f2 are on *features*")
(load "script-support")
(load (compile-file-pathname "../asdf"))
(load-asdf)
(in-package :asdf)
(cl-user::quit-on-error
(let ((fasl1 (asdf:compile-file-pathname* (truename "file1.lisp")))
......
;;; -*- Lisp -*-
;;; -*- Lisp -*-
(load "script-support")
(load (compile-file-pathname "../asdf"))
(load-asdf)
(in-package :asdf)
(cl-user::quit-on-error
(setf asdf:*central-registry* '(*default-pathname-defaults*))
......
......@@ -3,7 +3,7 @@
;;; make sure we get a missing-component error
(load "script-support")
(load (compile-file-pathname "../asdf"))
(load-asdf)
(in-package #:common-lisp-user)
(quit-on-error
......
......@@ -3,7 +3,7 @@
;;; make sure we get a missing-component-of-version error
(load "script-support")
(load (compile-file-pathname "../asdf"))
(load-asdf)
(in-package #:common-lisp-user)
(quit-on-error
......
;;; -*- Lisp -*-
(load "script-support")
(load (compile-file-pathname "../asdf"))
(load-asdf)
(quit-on-error
(load (compile-file-pathname "../asdf"))
(load-asdf)
(load "../wild-modules")
(setf asdf:*central-registry* '(*default-pathname-defaults*))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment