Commit 5db533b0 authored by Francois-Rene Rideau's avatar Francois-Rene Rideau
Browse files

Test image-op. Add missing implementation method (oops).

parent b80f6659

bundle.lisp

+5 −4
Changes for bundle.lisp: 5 added lines, 4 removed lines.
Original line number Original line Diff line number Diff line
@@ -170,10 +170,11 @@ itself.")) ;; operation on a system and its dependencies 
    (bundle-output-files o c))

    (bundle-output-files o c))





  #-(or ecl mkcl)

  #-(or ecl mkcl)

  (defmethod perform ((o program-op) (c system))

  (progn

    (let ((output-file (output-file o c)))

    (defmethod perform ((o image-op) (c system))

      (setf *image-entry-point* (ensure-function (component-entry-point c)))

      (dump-image (output-file o c) :executable (typep o 'program-op)))

      (dump-image output-file :executable t)))

    (defmethod perform :before ((o program-op) (c system))

      (setf *image-entry-point* (ensure-function (component-entry-point c)))))





  (defclass compiled-file (file-component)

  (defclass compiled-file (file-component)

    ((type :initform #-(or ecl mkcl) (compile-file-type) #+(or ecl mkcl) "fasb")))

    ((type :initform #-(or ecl mkcl) (compile-file-type) #+(or ecl mkcl) "fasb")))

test/hello-world-example.asd

+1 −1
Changes for test/hello-world-example.asd: 1 added line, 1 removed line.
Original line number Original line Diff line number Diff line
@@ -2,7 +2,7 @@ 




#-mkcl

#-mkcl

(defsystem :hello-world-example

(defsystem :hello-world-example

  :build-operation program-op

  ;; :build-operation program-op ; this would cause the executable output in same directory :-/

  :entry-point "hello:entry-point"

  :entry-point "hello:entry-point"

  :depends-on (:uiop)

  :depends-on (:uiop)

  :components ((:file "hello")))

  :components ((:file "hello")))

test/make-hello-world.lisp

+16 −4
Changes for test/make-hello-world.lisp: 16 added lines, 4 removed lines.
Original line number Original line Diff line number Diff line
@@ -10,8 +10,20 @@ 




(asdf-test::frob-packages)

(asdf-test::frob-packages)





(with-test ()

(dolist (s '(:asdf :uiop :asdf/defsystem :uiop))

  ;;(dolist (s '(:asdf :uiop :asdf/defsystem :uiop)) (DBG :foo s (asdf::builtin-system-p (find-system s))))

  (assert (asdf::builtin-system-p (find-system s)) () "System ~A not builtin(!)" s))

  ;;(trace perform-plan perform)



(defun make-hello-image ()

  (operate 'load-fasl-op :hello-world-example)

  (operate 'image-op :hello-world-example))



(defun make-hello-program ()

  (operate 'load-fasl-op :hello-world-example)

  (operate 'load-fasl-op :hello-world-example)

  (operate 'program-op :hello-world-example))
 
  (operate 'program-op :hello-world-example)

  #+(and mkcl windows) ;; make sure mkcl-X.X.X.dll is the same directory as the executable

  (let* ((dll-orig (subpathname (si::self-truename)

                                (strcat "mkcl_" (lisp-implementation-version) ".dll")))

         (exe (asdf::output-file 'program-op :hello-world-example))

         (dll-dest (subpathname exe dll-orig)))

    (copy-file dll-orig dll-dest)))

test/run-tests.sh

+5 −5
Changes for test/run-tests.sh: 5 added lines, 5 removed lines.
Original line number Original line Diff line number Diff line
@@ -144,7 +144,7 @@ do_tests () { 
      echo "Testing: $i" >&2

      echo "Testing: $i" >&2

      test_count=`expr "$test_count" + 1`

      test_count=`expr "$test_count" + 1`

      rm -f ~/.cache/common-lisp/"`pwd`"/* || true

      rm -f ~/.cache/common-lisp/"`pwd`"/* || true

      if DO $bcmd $eval "'(#.(load(string'|script-support.lisp|))#.(asdf-test::load-asdf)#.(asdf-test::frob-packages)#.(asdf-test::with-test()(load(string'|$i|))))" ; then

      if DO $bcmd $eval "'(#.(load(string'|script-support.lisp|))#.(asdf-test::load-asdf)#.(asdf-test::frob-packages)#.(asdf-test:run-test-script'|$i|))" ; then

        echo "Using $command, $i passed" >&2

        echo "Using $command, $i passed" >&2

	test_pass=`expr "$test_pass" + 1`

	test_pass=`expr "$test_pass" + 1`

      else

      else
@@ -476,10 +476,10 @@ test_clean_load () { 
    nop=build/results/${lisp}-nop.text

    nop=build/results/${lisp}-nop.text

    load=build/results/${lisp}-load.text

    load=build/results/${lisp}-load.text

    $bcmd $eval \

    $bcmd $eval \

      "(or'#.(load(string'|test/script-support.lisp|):verbose():print())#.(asdf-test::exit-lisp'0))" \

      "(or'#.(load(string'|test/script-support.lisp|):verbose():print())#.(asdf-test:exit-lisp'0))" \

      > $nop 2>&1

      > $nop 2>&1

    $bcmd $eval \

    $bcmd $eval \

      "(or'#.(load(string'|test/script-support.lisp|):verbose():print())#.(asdf-test::verbose())#.(load(string'|build/asdf.lisp|):verbose())#.(asdf/image:quit'0))" \

      "(or'#.(load(string'|test/script-support.lisp|):verbose():print())#.(asdf-test:verbose())#.(load(string'|build/asdf.lisp|):verbose())#.(asdf/image:quit'0))" \

      > $load 2>&1

      > $load 2>&1

    if diff $nop $load ; then

    if diff $nop $load ; then

      echo "GOOD: Loading ASDF on $lisp produces no message" >&2 ; return 0

      echo "GOOD: Loading ASDF on $lisp produces no message" >&2 ; return 0
@@ -492,13 +492,13 @@ test_load_systems () { 
    mkdir -p build/results/

    mkdir -p build/results/

    echo "Loading all these systems: $*"

    echo "Loading all these systems: $*"

    $bcmd $eval \

    $bcmd $eval \

      "(or #.(load(string'|test/script-support.lisp|))#.(asdf-test::with-test()(asdf-test::test-load-systems $*)))" \

      "(or #.(load(string'|test/script-support.lisp|))#.(asdf-test:with-test()(asdf-test:test-load-systems $*)))" \

        2>&1 | tee build/results/${lisp}-systems.text

        2>&1 | tee build/results/${lisp}-systems.text

}

}

test_interactively () {

test_interactively () {

    cd ${ASDFDIR}

    cd ${ASDFDIR}

    mkdir -p build/results/

    mkdir -p build/results/

    rlwrap $icmd $eval "(or'#.(load(string'|test/script-support.lisp|))#.(asdf-test::interactive-test'($*)))"

    rlwrap $icmd $eval "(or'#.(load(string'|test/script-support.lisp|))#.(asdf-test:interactive-test'($*)))"

}

}





if [ -z "$command" ] ; then

if [ -z "$command" ] ; then

test/script-support.lisp

+8 −0
Changes for test/script-support.lisp: 8 added lines, 0 removed lines.
Original line number Original line Diff line number Diff line
@@ -24,6 +24,8 @@ Some constraints: 
   #:load-asdf-system #:clean-load-asdf-system

   #:load-asdf-system #:clean-load-asdf-system

   #:register-directory #:load-test-system

   #:register-directory #:load-test-system

   #:with-test #:test-asdf #:debug-asdf

   #:with-test #:test-asdf #:debug-asdf

   #:run-test-script #:interactive-test

   #:verbose #:exit-lisp

   #:assert-compare

   #:assert-compare

   #:assert-equal

   #:assert-equal

   #:leave-test #:def-test-system

   #:leave-test #:def-test-system
@@ -357,6 +359,12 @@ is bound, write a message and exit on an error. If 
  (setf *package* (some 'find-package '(:asdf :uiop :asdf/utility :asdf/package :asdf-test)))

  (setf *package* (some 'find-package '(:asdf :uiop :asdf/utility :asdf/package :asdf-test)))

  (load "contrib/debug.lisp"))

  (load "contrib/debug.lisp"))





(defun run-test-script (file)

  (with-test ()

    (let ((name (string file)))

      (format t "Running ~A with ~A~%" name (acall :implementation-identifier))

      (load name))))



(defun load-asdf-lisp (&optional tag)

(defun load-asdf-lisp (&optional tag)

  (quietly (load (asdf-lisp tag) :verbose *load-verbose* :print *load-print*)))

  (quietly (load (asdf-lisp tag) :verbose *load-verbose* :print *load-print*)))