Ticket #1057: make-check-without-installation.diff

File make-check-without-installation.diff, 5.7 KB (added by Christian Kellermann, 8 years ago)

Newer patch that also has deployment tests covered

  • csc.scm

    diff --git a/csc.scm b/csc.scm
    index a39c3f5..885ea39 100644
    a b EOF 
    966966              TARGET_RUN_LIB_HOME)))
    967967
    968968(define (target-lib-path)
     969  (or (get-environment-variable "TARGET_LIB_PATH")
    969970      (let ((tdir TARGET_LIB_HOME))
    970971        (if (and (not (string=? tdir ""))
    971972                 cross-chicken
    972973                 (not host-mode))
    973974            tdir
    974         (lib-path))))
     975            (lib-path)))))
    975976
    976977(define (copy-libraries targetdir)
    977978  (let ((lib (make-pathname
  • tests/runtests.sh

    diff --git a/tests/runtests.sh b/tests/runtests.sh
    index 7065564..b4a5f93 100755
    a b CHICKEN_INSTALL=${TEST_DIR}/../chicken-install 
    4242CHICKEN_UNINSTALL=${TEST_DIR}/../chicken-uninstall
    4343ASMFLAGS=
    4444FAST_OPTIONS="-O5 -d0 -b -disable-interrupts"
     45COMPILE_OPTIONS="-compiler ${TEST_DIR}/../chicken -v -I${TEST_DIR}/.. -L${TEST_DIR}/.. -include-path ${TEST_DIR}/.."
     46SETUP_PREFIX="-e (use setup-api)"
     47SETUP_PREFIX="${SETUP_PREFIX} -e (register-program \"csc\" \"${TEST_DIR}/../csc\")"
     48SETUP_PREFIX="${SETUP_PREFIX} -e (register-program \"chicken\" \"${TEST_DIR}/../chicken\")"
     49SETUP_PREFIX="${SETUP_PREFIX} -e (register-program \"csi\" \"${TEST_DIR}/../csi\")"
    4550
    4651TYPESDB=../types.db
    4752cp $TYPESDB test-repository/types.db
    if test -f ../cygchicken-0.dll; then 
    6166    mv ../cygchicken-0.dll ../cygchicken-0.dll_
    6267fi
    6368
    64 compile="../csc -compiler $CHICKEN -v -I.. -L.. -include-path .. -o a.out"
     69compile="../csc -types ${TYPESDB} -ignore-repository ${COMPILE_OPTIONS} -o a.out"
    6570compile2="../csc -compiler $CHICKEN -v -I.. -L.. -include-path .."
    66 compile_s="../csc -s -compiler $CHICKEN -v -I.. -L.. -include-path .."
     71compile_s="../csc -s -types ${TYPESDB} -ignore-repository ${COMPILE_OPTIONS} -v -I.. -L.. -include-path .."
    6772interpret="../csi -n -include-path .."
    6873
    6974rm -f *.exe *.so *.o *.import.* a.out ../foo.import.*
    $compile inlining-tests.scm -optimize-level 3 
    8085echo "======================================== scrutiny tests ..."
    8186$compile typematch-tests.scm -specialize -w
    8287./a.out
    83 $compile scrutiny-tests.scm -A -scrutinize -ignore-repository -types $TYPESDB 2>scrutiny.out -verbose
     88$compile scrutiny-tests.scm -A -scrutinize 2>scrutiny.out -verbose
    8489
    8590# this is sensitive to gensym-names, so make it optional
    8691if test \! -f scrutiny.expected; then
    fi 
    8994
    9095diff $DIFF_OPTS scrutiny.expected scrutiny.out
    9196
    92 $compile scrutiny-tests-2.scm -A -scrutinize -analyze-only -ignore-repository -types $TYPESDB 2>scrutiny-2.out -verbose
     97$compile scrutiny-tests-2.scm -A -scrutinize -analyze-only 2>scrutiny-2.out -verbose
    9398
    9499# this is sensitive to gensym-names, so make it optional
    95100if test \! -f scrutiny-2.expected; then
    fi 
    98103
    99104diff $DIFF_OPTS scrutiny-2.expected scrutiny-2.out
    100105
    101 $compile scrutiny-tests-3.scm -specialize -block -ignore-repository -types $TYPESDB
     106$compile scrutiny-tests-3.scm -specialize -block
    102107./a.out
    103108
    104 $compile scrutiny-tests-strict.scm -strict-types -specialize -ignore-repository -types $TYPESDB
     109$compile scrutiny-tests-strict.scm -strict-types -specialize
    105110./a.out
    106111
    107112echo "======================================== specialization tests ..."
    $interpret -bnq test-glob.scm 
    354359echo "======================================== compiler/nursery stress test ..."
    355360for s in 100000 120000 200000 250000 300000 350000 400000 450000 500000; do
    356361    echo "  $s"
    357     ../chicken ../utils.scm -:s$s -output-file tmp.c -include-path ..
     362    ../chicken -ignore-repository ../utils.scm -:s$s -output-file tmp.c -include-path ..
    358363done
    359364
    360365echo "======================================== symbol-GC tests ..."
    rm -fr rev-app rev-app-2 reverser/*.import.* reverser/*.so 
    400405
    401406echo "======================================== reinstall tests"
    402407CHICKEN_REPOSITORY=$CHICKEN_REPOSITORY $CHICKEN_UNINSTALL -force reverser
    403 CHICKEN_REPOSITORY=$CHICKEN_REPOSITORY $CHICKEN_INSTALL -t local -l $TEST_DIR reverser:1.0 \
    404  -csi ${TEST_DIR}/../csi
     408CHICKEN_REPOSITORY=$CHICKEN_REPOSITORY CSC_OPTIONS=$COMPILE_OPTIONS \
     409    CSI_OPTIONS=$SETUP_PREFIX $CHICKEN_INSTALL -t local -l $TEST_DIR \
     410    -csi ${TEST_DIR}/../csi reverser:1.0
    405411CHICKEN_REPOSITORY=$CHICKEN_REPOSITORY $interpret -bnq rev-app.scm 1.0
    406 CHICKEN_REPOSITORY=$CHICKEN_REPOSITORY $CHICKEN_INSTALL -t local -l $TEST_DIR -reinstall -force \
    407  -csi ${TEST_DIR}/../csi
     412CHICKEN_REPOSITORY=$CHICKEN_REPOSITORY CSC_OPTIONS=$COMPILE_OPTIONS \
     413    CSI_OPTIONS=$SETUP_PREFIX $CHICKEN_INSTALL -t local -l $TEST_DIR \
     414    -reinstall -force -csi ${TEST_DIR}/../csi
    408415CHICKEN_REPOSITORY=$CHICKEN_REPOSITORY $interpret -bnq rev-app.scm 1.0
    409416
    410417if test $OS_NAME != AIX -a $OS_NAME != SunOS -a $OS_NAME != GNU; then
    411418        echo "======================================== deployment tests"
    412419        mkdir rev-app
    413         CHICKEN_REPOSITORY=$CHICKEN_REPOSITORY $CHICKEN_INSTALL -t local -l $TEST_DIR reverser
    414         CHICKEN_REPOSITORY=$CHICKEN_REPOSITORY $compile2 -deploy rev-app.scm
    415         CHICKEN_REPOSITORY=$CHICKEN_REPOSITORY $CHICKEN_INSTALL -deploy -prefix rev-app -t local -l $TEST_DIR reverser
     420        TARGET_LIB_PATH=${TEST_DIR}/.. CHICKEN_REPOSITORY=$CHICKEN_REPOSITORY CSC_OPTIONS=$COMPILE_OPTIONS \
     421                          CSI_OPTIONS=$SETUP_PREFIX $CHICKEN_INSTALL -csi ${TEST_DIR}/../csi -t local -l $TEST_DIR reverser
     422        TARGET_LIB_PATH=${TEST_DIR}/.. CHICKEN_REPOSITORY=$CHICKEN_REPOSITORY CSC_OPTIONS=$COMPILE_OPTIONS \
     423                          CSI_OPTIONS=$SETUP_PREFIX $compile2 -deploy rev-app.scm
     424        TARGET_LIB_PATH=${TEST_DIR}/.. CHICKEN_REPOSITORY=$CHICKEN_REPOSITORY CSC_OPTIONS=$COMPILE_OPTIONS \
     425                          CSI_OPTIONS=$SETUP_PREFIX $CHICKEN_INSTALL -csi ${TEST_DIR}/../csi -deploy -prefix rev-app -t local -l $TEST_DIR reverser
    416426        unset LD_LIBRARY_PATH DYLD_LIBRARY_PATH CHICKEN_REPOSITORY
    417427        # An absolute path is required on NetBSD with $ORIGIN, hence `pwd`
    418428        `pwd`/rev-app/rev-app 1.1