Skip to content
Snippets Groups Projects
Commit fff0c816 authored by Gary King's avatar Gary King
Browse files

Tweaked many tests to remove many warnings

parent 291676b6
Branches
Tags 1.362
No related merge requests found
Showing
with 89 additions and 28 deletions
......@@ -84,12 +84,12 @@ elif [ "$lisp" = "clisp" ] ; then
elif [ "$lisp" = "allegro" ] ; then
if type alisp ; then
fasl_ext="fasl"
command="alisp -q --batch "
command="alisp -q -batch "
fi
elif [ "$lisp" = "allegromodern" ] ; then
if type mlisp ; then
fasl_ext="fasl"
command="mlisp -q --batch "
command="mlisp -q -batch "
fi
elif [ "$lisp" = "ccl" ] ; then
if type ccl ; then
......
......@@ -27,7 +27,7 @@
(error "Don't know how to quit Lisp; wanting to use exit code ~a" return))
(defmacro exit-on-error (&body body)
(defmacro quit-on-error (&body body)
`(handler-case
(progn ,@body
(leave-lisp "Script succeeded" 0))
......
;;; -*- Lisp -*-
(load "script-support")
(load "../asdf")
(exit-on-error
(quit-on-error
(setf asdf:*central-registry* '(*default-pathname-defaults*))
(asdf:operate 'asdf:load-op 'test-force)
(defvar file1-date (file-write-date (compile-file-pathname "file1")))
(defvar file1-date (file-write-date (compile-file-pathname "file1"))))
(quit-on-error
;; unforced, date should stay same
(sleep 1)
(asdf:operate 'asdf:load-op 'test-force)
......
......@@ -6,7 +6,7 @@
(load "../asdf")
(in-package #:common-lisp-user)
(exit-on-error
(quit-on-error
(setf asdf:*central-registry* nil)
(load (merge-pathnames "test-nested-components-1.asd"))
(print
......
......@@ -2,7 +2,7 @@
;;; -*- Lisp -*-
(load "script-support")
(load "../asdf")
(exit-on-error
(quit-on-error
(defun module () 1)
......
......@@ -9,7 +9,7 @@
;#+allegro
;(trace excl.osi:command-output)
(defvar *caught-error* nil)
(exit-on-error
(quit-on-error
(when (probe-file "try-reloading-dependency.asd")
(asdf:run-shell-command "rm -f ~A"
(namestring "try-reloading-dependency.asd")))
......
;;; -*- Lisp -*-
(load "script-support")
(load "../asdf")
(exit-on-error
(quit-on-error
(setf asdf:*central-registry* '(*default-pathname-defaults*))
(asdf:operate 'asdf:load-op 'static-and-serial)
(defvar file1-date (file-write-date (compile-file-pathname "file1")))
(defvar file1-date (file-write-date (compile-file-pathname "file1"))))
(quit-on-error
;; cheat
(setf asdf::*defined-systems* (make-hash-table :test 'equal))
......
......@@ -5,7 +5,7 @@
(load "script-support")
(load "../asdf")
(exit-on-error
(quit-on-error
(flet ((system-load-time (name)
(let ((data (asdf::system-registered-p name)))
(when data
......
......@@ -5,7 +5,7 @@
(load "script-support")
(load "../asdf")
(exit-on-error
(quit-on-error
(flet ((system-load-time (name)
(let ((data (asdf::system-registered-p name)))
(when data
......
......@@ -4,11 +4,12 @@
(load "script-support")
(load "../asdf")
(exit-on-error
(defvar *caught-error* nil)
(quit-on-error
(asdf:run-shell-command "rm -f ~A"
(namestring
(compile-file-pathname "try-recompiling-1")))
(defvar *caught-error* nil)
(setf asdf:*central-registry* '(*default-pathname-defaults*))
(handler-bind ((error (lambda (c)
(setf *caught-error* t)
......
......@@ -8,7 +8,7 @@
(in-package :test-version-system)
(cl-user::exit-on-error
(cl-user::quit-on-error
(defsystem :versioned-system-1
:pathname #.*default-pathname-defaults*
:version "1.0")
......
;;; -*- Lisp -*-
(load "script-support")
(load "../asdf")
(exit-on-error
(quit-on-error
(setf asdf:*central-registry* '(*default-pathname-defaults*))
(asdf:operate 'asdf:load-op 'test1)
;; test that it compiled
(defvar file1-date (file-write-date (compile-file-pathname "file1")))
(defvar file1-date (file-write-date (compile-file-pathname "file1"))))
(quit-on-error
(assert (and file1-date (file-write-date (compile-file-pathname "file2")))))
;; and loaded
(assert test-package::*file1*)
(exit-on-error
(quit-on-error
;; now remove one output file and check that the other is _not_
;; recompiled
(sleep 1) ; mtime has 1-second granularity, so pause here for fast machines
......
;;; -*- Lisp -*-
(load "script-support")
(load "../asdf")
(exit-on-error
(quit-on-error
(setf asdf:*central-registry* '(*default-pathname-defaults*))
;(trace asdf::perform)
;(trace asdf::find-component)
......@@ -13,10 +13,14 @@
(asdf:oos 'asdf:load-op 'test2b2)
(asdf:missing-dependency (c)
(format t "load failed as expected: - ~%~A~%" c))
(:no-error (c) (error "should have failed, oops")))
(:no-error (c)
(declare (ignore c))
(error "should have failed, oops")))
(handler-case
(asdf:oos 'asdf:load-op 'test2b3)
(asdf:missing-dependency (c)
(format t "load failed as expected: - ~%~A~%" c))
(:no-error (c) (error "should have failed, oops")))
(:no-error (c)
(declare (ignore c))
(error "should have failed, oops")))
)
\ No newline at end of file
......@@ -4,7 +4,7 @@
(load "script-support")
(load "../asdf")
(in-package :asdf)
(cl-user::exit-on-error
(cl-user::quit-on-error
(let ((fasl1 (compile-file-pathname (merge-pathnames "file1")))
(fasl2 (compile-file-pathname (merge-pathnames "file2"))))
(asdf:run-shell-command "rm -f ~A ~A"
......
......@@ -3,7 +3,7 @@
(load "script-support")
(load "../asdf")
(in-package :asdf)
(cl-user::exit-on-error
(cl-user::quit-on-error
(setf asdf:*central-registry* '(*default-pathname-defaults*))
(assert (not (component-property (find-system 'test3) :foo)))
(assert (equal (component-property (find-system 'test3) :prop1) "value"))
......
......@@ -6,14 +6,17 @@
(load "../asdf")
(in-package #:common-lisp-user)
(exit-on-error
(quit-on-error
(setf asdf:*central-registry* '(*default-pathname-defaults*))
(handler-case
(asdf:oos 'asdf:load-op 'system-does-not-exist)
(asdf:missing-component-of-version (c)
(declare (ignore c))
(error "Should not have gotten 'missing-component-of-version, dang"))
(asdf:missing-component (c)
(format t "got missing-component as expected: - ~%~A~%" c))
(:no-error (c) (error "should have failed, oops"))))
(:no-error (c)
(declare (ignore c))
(error "should have failed, oops"))))
......@@ -6,7 +6,7 @@
(load "../asdf")
(in-package #:common-lisp-user)
(exit-on-error
(quit-on-error
(setf asdf:*central-registry* nil)
(load (merge-pathnames "test9-1.asd"))
(load (merge-pathnames "test9-2.asd"))
......@@ -14,7 +14,9 @@
(asdf:oos 'asdf:load-op 'test9-1)
(asdf:missing-component-of-version (c)
(format t "got missing-component-of-version as expected: - ~%~A~%" c))
(:no-error (c) (error "should have failed, oops"))))
(:no-error (c)
(declare (ignore c))
(error "should have failed, oops"))))
;;; -*- Lisp -*-
(load "script-support")
(load "../asdf")
(exit-on-error
(quit-on-error
(load "../asdf")
(load "../wild-modules")
......
## git recipes
> Alternatively, would someone please provide simple recipes for dealing
> with git? It's really far more complex than CVS, and I don't see
> obvious patterns of interaction to do simple things like restore
> synchronization with the central repo.
git fetch origin
downloads latest commits
git reset --hard origin/master
nukes all local changes, synchronizing with the remote repo
## git resources
Here are a few links that might be helpful to people learning
git. Its culturally different than CVS; but once you learn
it, there's no turning back. The ability to experiment with
local branches, back up, rewrite history, and only publish
the sanitized history is quite liberating.
* http://progit.org/book/ (recommended)
* http://tomayko.com/writings/the-thing-about-git
* http://git-scm.com/documentation
* http://www.kernel.org/pub/software/scm/git/docs/gittutorial.html
* http://www.kernel.org/pub/software/scm/git/docs/everyday.html
* http://www.kernel.org/pub/software/scm/git/docs/user-manual.html
My suggestions
* always have `gitk --all` loaded for the repo you're working on
* update (not reload) `gitk` after modifying any branches or
tags; this leaves the old objects displayed
* `git reset --hard $OLDSHA1` can clean many messes, letting
you try again.
* reload gitk to hide deleted branches you're comfortable
with losing
* learn by playing around with local clones of a larger
repository
* install some of the git contribs, especially
git-completion.bash and git-new-workdir
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment