Commit f36495a0 authored by Daniel Kochmański's avatar Daniel Kochmański Committed by Marius Gerbershagen

cleanup: don't use logical pathnames for auxiliary files

While clever it is undesired to have all tests depend on auxiliary
files. We fix that by introducing compile-and-load* function which
merges the pathname with the auxiliary directory (*AUX-DIR*).
parent 886a6a41
;;; Tests on arrays
(compile-and-load "ANSI-TESTS:AUX;array-aux.lsp")
(compile-and-load "ANSI-TESTS:AUX;bit-aux.lsp")
(compile-and-load* "array-aux.lsp")
(compile-and-load* "bit-aux.lsp")
(in-package #:cl-test)
......
......@@ -6,7 +6,7 @@
(eval-when (:load-toplevel :compile-toplevel :execute)
(compile-and-load "ANSI-TESTS:AUX;random-aux.lsp"))
(compile-and-load* "random-aux.lsp"))
(defparameter *hash-table-test-iters* 1000)
......
......@@ -6,7 +6,7 @@
(eval-when (:compile-toplevel :load-toplevel :execute)
(compile-and-load "ANSI-TESTS:AUX;random-aux.lsp"))
(compile-and-load* "random-aux.lsp"))
;;; Binary search on reals
......
......@@ -6,7 +6,7 @@
(eval-when (:compile-toplevel :load-toplevel :execute)
(compile-and-load "ANSI-TESTS:AUX;random-aux.lsp"))
(compile-and-load* "random-aux.lsp"))
(defmacro def-print-test (name form result &rest bindings)
`(deftest ,name
......
......@@ -6,7 +6,7 @@
(eval-when (:compile-toplevel :load-toplevel :execute)
(compile-and-load "ANSI-TESTS:AUX;random-aux.lsp"))
(compile-and-load* "random-aux.lsp"))
(defun my-string-compare (string1 string2 comparison
&key (start1 0) end1 (start2 0) end2 case
......
;;;; Character tests
(compile-and-load "ANSI-TESTS:AUX;char-aux.lsp")
(compile-and-load* "char-aux.lsp")
(in-package #:cl-test)
......
......@@ -8,7 +8,8 @@
(unless pkg (setq pkg (make-package name :use '(:cl :regression-test))))
(let ((*package* pkg))
(shadow '(#:handler-case #:handler-bind))
(import '(common-lisp-user::compile-and-load)
(import '(common-lisp-user::compile-and-load
common-lisp-user::compile-and-load*)
pkg)
(export (mapcar #'intern
(mapcar #'symbol-name
......
......@@ -19,6 +19,9 @@
"List containing pathname, creation times for files that have already
been loaded.")
(defun compile-and-load* (pathspec &key force)
(compile-and-load (merge-pathnames pathspec *aux-dir*) :force force))
(defun compile-and-load (pathspec &key force)
"Find the file indicated by PATHSPEC, compiling it first if
the associated compiled file is out of date."
......
;;; Tests of conditions
(compile-and-load "ANSI-TESTS:AUX;types-aux.lsp")
(compile-and-load "ANSI-TESTS:AUX;define-condition-aux.lsp")
(compile-and-load* "types-aux.lsp")
(compile-and-load* "define-condition-aux.lsp")
(in-package #:cl-test)
......
;;; Tests of conses
(compile-and-load "ANSI-TESTS:AUX;cons-aux.lsp")
(compile-and-load* "cons-aux.lsp")
(in-package #:cl-test)
......
;;; Tests of data and control flow
(compile-and-load "ANSI-TESTS:AUX;cons-aux.lsp")
(compile-and-load "ANSI-TESTS:AUX;random-aux.lsp")
(compile-and-load "ANSI-TESTS:AUX;types-aux.lsp")
(compile-and-load* "cons-aux.lsp")
(compile-and-load* "random-aux.lsp")
(compile-and-load* "types-aux.lsp")
(in-package #:cl-test)
......
......@@ -23,12 +23,11 @@
#+clisp (setq custom::*warn-on-floating-point-contagion* nil)
;;; Configure logical pathnames
(setf (logical-pathname-translations "ANSI-TESTS")
`(("AUX;*.*.*"
,(merge-pathnames "auxiliary/"
(make-pathname
:directory
(pathname-directory *load-truename*))))))
(defvar *aux-dir*
(merge-pathnames "auxiliary/"
(make-pathname
:directory
(pathname-directory *load-truename*))))
(let (*load-verbose* *load-print* *compile-verbose* *compile-print*)
(load "compile-and-load.lsp"))
......@@ -38,13 +37,13 @@
(compile-and-load "rt.lsp")
(load "cl-test-package.lsp")
(in-package :cl-test)
(compile-and-load "ANSI-TESTS:AUX;ansi-aux-macros.lsp")
(compile-and-load* "ansi-aux-macros.lsp")
(handler-bind
#-sbcl ()
#+sbcl ((sb-ext:code-deletion-note #'muffle-warning))
(load "universe.lsp"))
(compile-and-load "ANSI-TESTS:AUX;random-aux.lsp")
(compile-and-load "ANSI-TESTS:AUX;ansi-aux.lsp")
(compile-and-load* "random-aux.lsp")
(compile-and-load* "ansi-aux.lsp")
(load "cl-symbol-names.lsp")
(load "notes.lsp"))
......
(compile-and-load "ANSI-TESTS:AUX;hash-table-aux.lsp")
(compile-and-load* "hash-table-aux.lsp")
(in-package #:cl-test)
......
......@@ -3,21 +3,21 @@
;;;; Created: Mon Apr 7 07:16:44 2003
;;;; Contains: Forms to load files containing tests of number concepts
(compile-and-load "ANSI-TESTS:AUX;numbers-aux.lsp")
(compile-and-load "ANSI-TESTS:AUX;random-aux.lsp")
(compile-and-load "ANSI-TESTS:AUX;floor-aux.lsp")
(compile-and-load "ANSI-TESTS:AUX;ffloor-aux.lsp")
(compile-and-load "ANSI-TESTS:AUX;ceiling-aux.lsp")
(compile-and-load "ANSI-TESTS:AUX;fceiling-aux.lsp")
(compile-and-load "ANSI-TESTS:AUX;truncate-aux.lsp")
(compile-and-load "ANSI-TESTS:AUX;ftruncate-aux.lsp")
(compile-and-load "ANSI-TESTS:AUX;round-aux.lsp")
(compile-and-load "ANSI-TESTS:AUX;fround-aux.lsp")
(compile-and-load "ANSI-TESTS:AUX;times-aux.lsp")
(compile-and-load "ANSI-TESTS:AUX;division-aux.lsp")
(compile-and-load "ANSI-TESTS:AUX;exp-aux.lsp")
(compile-and-load "ANSI-TESTS:AUX;gcd-aux.lsp")
(compile-and-load "ANSI-TESTS:AUX;types-aux.lsp")
(compile-and-load* "numbers-aux.lsp")
(compile-and-load* "random-aux.lsp")
(compile-and-load* "floor-aux.lsp")
(compile-and-load* "ffloor-aux.lsp")
(compile-and-load* "ceiling-aux.lsp")
(compile-and-load* "fceiling-aux.lsp")
(compile-and-load* "truncate-aux.lsp")
(compile-and-load* "ftruncate-aux.lsp")
(compile-and-load* "round-aux.lsp")
(compile-and-load* "fround-aux.lsp")
(compile-and-load* "times-aux.lsp")
(compile-and-load* "division-aux.lsp")
(compile-and-load* "exp-aux.lsp")
(compile-and-load* "gcd-aux.lsp")
(compile-and-load* "types-aux.lsp")
(in-package #:cl-test)
......
......@@ -3,7 +3,7 @@
;;;; Created: Mon Mar 24 03:39:09 2003
;;;; Contains: Loader for CLOS-related test files
(compile-and-load "ANSI-TESTS:AUX;defclass-aux.lsp")
(compile-and-load* "defclass-aux.lsp")
(in-package #:cl-test)
......
......@@ -3,8 +3,8 @@
;;;; Created: Sun Oct 6 00:32:56 2002
;;;; Contains: Loader for files containing package tests
(compile-and-load "ANSI-TESTS:AUX;packages00-aux.lsp")
(compile-and-load "ANSI-TESTS:AUX;package-aux.lsp")
(compile-and-load* "packages00-aux.lsp")
(compile-and-load* "package-aux.lsp")
(in-package #:cl-test)
......
;;;; Tests for pathnames and logical pathnames
(compile-and-load "ANSI-TESTS:AUX;pathnames-aux.lsp")
(compile-and-load* "pathnames-aux.lsp")
(in-package #:cl-test)
......
;;;; Tests of the lisp printer
(compile-and-load "ANSI-TESTS:AUX;printer-aux.lsp")
(compile-and-load "ANSI-TESTS:AUX;backquote-aux.lsp")
(compile-and-load* "printer-aux.lsp")
(compile-and-load* "backquote-aux.lsp")
(in-package #:cl-test)
......
......@@ -4,7 +4,7 @@
(load "../rt-package.lsp")
(compile-and-load "../rt.lsp")
(load "../cl-test-package.lsp")
(compile-and-load "ANSI-TESTS:AUX;random-aux.lsp")
(compile-and-load* "random-aux.lsp")
(load "rctest-package.lsp")
(compile-and-load "rctest-util.lsp")
(compile-and-load "generator.lsp")
......
......@@ -5,7 +5,7 @@
(defpackage :rctest
(:use :cl :cl-test)
(:import-from "COMMON-LISP-USER" #:compile-and-load)
(:import-from "COMMON-LISP-USER" #:compile-and-load #:compile-and-load*)
(:export
#:generate
))
......
;;;; Tests of the reader
(compile-and-load "ANSI-TESTS:AUX;reader-aux.lsp")
(compile-and-load* "reader-aux.lsp")
(in-package #:cl-test)
......
;;; Tests of sequences
(compile-and-load "ANSI-TESTS:AUX;search-aux.lsp")
(compile-and-load "ANSI-TESTS:AUX;subseq-aux.lsp")
(compile-and-load "ANSI-TESTS:AUX;remove-aux.lsp")
(compile-and-load "ANSI-TESTS:AUX;remove-duplicates-aux.lsp")
(compile-and-load* "search-aux.lsp")
(compile-and-load* "subseq-aux.lsp")
(compile-and-load* "remove-aux.lsp")
(compile-and-load* "remove-duplicates-aux.lsp")
(in-package #:cl-test)
......
;;; Tests of strings
(compile-and-load "ANSI-TESTS:AUX;string-aux.lsp")
(compile-and-load* "string-aux.lsp")
(in-package #:cl-test)
......
;;; Tests of symbols
(compile-and-load "ANSI-TESTS:AUX;cl-symbols-aux.lsp")
(compile-and-load* "cl-symbols-aux.lsp")
(in-package #:cl-test)
......
;;; Tests of types and classes
(compile-and-load "ANSI-TESTS:AUX;types-aux.lsp")
(compile-and-load* "types-aux.lsp")
(in-package #:cl-test)
......
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