Changeset 35400 in project


Ignore:
Timestamp:
04/21/18 19:01:19 (5 weeks ago)
Author:
kon
Message:

use csi+csc test runner

Location:
release/4/setup-helper/trunk
Files:
1 added
4 edited

Legend:

Unmodified
Added
Removed
  • release/4/setup-helper/trunk/setup-helper-mod.scm

    r35297 r35400  
    1 ;;;; setup-helper-mod.scm -*- Hen -*-
     1;;;; setup-helper-mod.scm
    22;;;; Kon Lovett, Apr '12
    33;;;; Kon Lovett, Oct '17
  • release/4/setup-helper/trunk/setup-helper.scm

    r35396 r35400  
    357357    -unit ,nam
    358358    ,@(if (output-file-option options) '() `(-output-file ,(static-filename nam)))
    359     ;-emit-import-library ,nam
    360     -emit-all-import-libraries
     359    ;-emit-all-import-libraries
     360    -emit-import-library ,nam
    361361    ,@(has-emit-inline inline? nam)
    362362    ,@(has-emit-types types? nam)
     
    372372    ,@(default-shared-compile-options)
    373373    ,@(if (output-file-option options) '() `(-output-file ,(shared-filename nam)))
    374     ;-emit-import-library ,nam
    375     -emit-all-import-libraries
     374    ;-emit-all-import-libraries
     375    -emit-import-library ,nam
    376376    ,@(has-emit-inline inline? nam)
    377377    ,@(has-emit-types types? nam)
  • release/4/setup-helper/trunk/setup-helper.setup

    r35396 r35400  
    1 ;;;; setup-helper.setup -*- Hen -*-
     1;;;; setup-helper.setup
    22
    3 (define this-verno "2.3.0")
     3(use files)
    44
    55(define (shared-filename bn)
    66  (make-pathname #f bn ##sys#load-dynamic-extension) )
    77
    8 (compile -s -O3 -d1 -scrutinize setup-helper-mod.scm -j setup-helper-mod)
     8(define *current-verno* "2.3.0")
     9
     10(compile -s -O3 -d1 -scrutinize setup-helper-mod.scm -J)
    911(compile -s -O3 -d0 setup-helper-mod.import.scm)
    1012
     
    1315  `(,(shared-filename "setup-helper-mod")
    1416        ,(shared-filename "setup-helper-mod.import") )
    15   `((version ,this-verno) ) )
     17  `((version ,*current-verno*) ) )
    1618
    1719;needed for backwards compat of dependency
    1820(install-extension 'setup-helper
    1921        '()
    20         `((version ,this-verno) ) )
     22        `((version ,*current-verno*) ) )
  • release/4/setup-helper/trunk/tests/run.scm

    r34702 r35400  
    1 ;;;; setup-helper tests/run.scm -*- Hen -*-
    2 ;;;; Kon Lovett, Oct '17
    31
    4 (use test)
     2(define EGG-NAME "setup-helper")
    53
    6 (use setup-helper-mod)
     4;chicken-install invokes as "<csi> -s run.scm <eggnam> <eggdir>"
    75
    8 (test-assert (string? *chicken-version*))
    9 (test-assert (string? *chicken-library-version*))
     6(use files)
    107
    11 (test-assert (list? (default-static-install-options)))
    12 (test-assert (list? (default-shared-install-options)))
    13 (test-assert (list? (default-static-module-install-options)))
    14 (test-assert (list? (default-shared-module-install-options)))
    15 (test-assert (list? (default-shared+static-module-install-options)))
    16 (test-assert (list? (default-static-compile-options)))
    17 (test-assert (list? (default-shared-compile-options)))
    18 (test-assert (list? (default-import-compile-options)))
     8;no -disable-interrupts
     9(define *csc-options* "-inline-global -scrutinize -optimize-leaf-routines -local -inline -specialize -unsafe -no-trace -no-lambda-info -clustering -lfa2")
    1910
    20 (test-exit)
     11(define *args* (argv))
     12
     13(define (test-name #!optional (eggnam EGG-NAME))
     14  (string-append eggnam "-test") )
     15
     16(define (egg-name #!optional (def EGG-NAME))
     17  (cond
     18    ((<= 4 (length *args*))
     19      (cadddr *args*) )
     20    (def
     21      def )
     22    (else
     23      (error 'test "cannot determine egg-name") ) ) )
     24
     25;;;
     26
     27(set! EGG-NAME (egg-name))
     28
     29(define (run-test #!optional (eggnam EGG-NAME) (cscopts *csc-options*))
     30  (let ((tstnam (test-name eggnam)))
     31    (print "*** csi ***")
     32    (system (string-append "csi -s " (make-pathname #f tstnam "scm")))
     33    (newline)
     34    (print "*** csc (" cscopts ") ***")
     35    (system (string-append "csc" " " cscopts " " (make-pathname #f tstnam "scm")))
     36    (system (make-pathname (cond-expand (unix "./") (else #f)) tstnam)) ) )
     37
     38(define (run-tests eggnams #!optional (cscopts *csc-options*))
     39  (for-each (cut run-test <> cscopts) eggnams) )
     40
     41;;;
     42
     43(run-test)
Note: See TracChangeset for help on using the changeset viewer.