Ticket #1057: standalone-tests.diff

File standalone-tests.diff, 4.7 KB (added by sjamaan, 11 years ago)

  • tests/runtests.sh 

    diff --git a/tests/runtests.sh b/tests/runtests.sh
index 352c35b..170b1c2 100755
    a b CHICKEN_INSTALL=${TEST_DIR}/../chicken-install 
    3535CHICKEN_UNINSTALL=${TEST_DIR}/../chicken-uninstall
    3636ASMFLAGS=
    3737FAST_OPTIONS="-O5 -d0 -b -disable-interrupts"
     38COMPILE_OPTIONS="-compiler ${TEST_DIR}/../chicken -v -I${TEST_DIR}/.. -L${TEST_DIR}/.. -include-path ${TEST_DIR}/.."
     39SETUP_PREFIX="-e (use setup-api)"
     40SETUP_PREFIX="${SETUP_PREFIX} -e (register-program \"csc\" \"${TEST_DIR}/../csc\")"
     41SETUP_PREFIX="${SETUP_PREFIX} -e (register-program \"chicken\" \"${TEST_DIR}/../chicken\")"
    3842
    3943TYPESDB=../types.db
    4044cp $TYPESDB test-repository/types.db
    … … if test -f ../cygchicken-0.dll; then 
    5458    mv ../cygchicken-0.dll ../cygchicken-0.dll_
    5559fi
    5660
    57 compile="../csc -compiler $CHICKEN -v -I.. -L.. -include-path .. -o a.out"
     61compile="../csc -types ${TYPESDB} -ignore-repository ${COMPILE_OPTIONS} -o a.out"
    5862compile2="../csc -compiler $CHICKEN -v -I.. -L.. -include-path .."
    59 compile_s="../csc -s -compiler $CHICKEN -v -I.. -L.. -include-path .."
     63compile_s="../csc -s -types ${TYPESDB} -ignore-repository ${COMPILE_OPTIONS} -v -I.. -L.. -include-path .."
    6064interpret="../csi -n -include-path .."
    6165
    6266rm -f *.exe *.so *.o *.import.* a.out ../foo.import.*
    … … $compile inlining-tests.scm -optimize-level 3 
    7276echo "======================================== scrutiny tests ..."
    7377$compile typematch-tests.scm -specialize -w
    7478./a.out
    75 $compile scrutiny-tests.scm -A -scrutinize -ignore-repository -types $TYPESDB 2>scrutiny.out -verbose
     79$compile scrutiny-tests.scm -A -scrutinize 2>scrutiny.out -verbose
    7680
    7781if test -n "$MSYSTEM"; then
    7882    dos2unix scrutiny.out
    … … fi 
    8589
    8690diff -bu scrutiny.expected scrutiny.out
    8791
    88 $compile scrutiny-tests-2.scm -A -scrutinize -analyze-only -ignore-repository -types $TYPESDB 2>scrutiny-2.out -verbose
     92$compile scrutiny-tests-2.scm -A -scrutinize -analyze-only 2>scrutiny-2.out -verbose
    8993
    9094if test -n "$MSYSTEM"; then
    9195    dos2unix scrutiny-2.out
    … … fi 
    98102
    99103diff -bu scrutiny-2.expected scrutiny-2.out
    100104
    101 $compile scrutiny-tests-3.scm -specialize -block -ignore-repository -types $TYPESDB
     105$compile scrutiny-tests-3.scm -specialize -block
    102106./a.out
    103107
    104 $compile scrutiny-tests-strict.scm -strict-types -specialize -ignore-repository -types $TYPESDB
     108$compile scrutiny-tests-strict.scm -strict-types -specialize
    105109./a.out
    106110
    107111echo "======================================== specialization tests ..."
    … … $interpret -bnq test-glob.scm 
    357361echo "======================================== compiler/nursery stress test ..."
    358362for s in 100000 120000 200000 250000 300000 350000 400000 450000 500000; do
    359363    echo "  $s"
    360     ../chicken ../utils.scm -:s$s -output-file tmp.c -include-path ..
     364    ../chicken -ignore-repository ../utils.scm -:s$s -output-file tmp.c -include-path ..
    361365done
    362366
    363367echo "======================================== symbol-GC tests ..."
    … … rm -fr rev-app rev-app-2 reverser/*.import.* reverser/*.so 
    403407
    404408echo "======================================== reinstall tests"
    405409CHICKEN_REPOSITORY=$CHICKEN_REPOSITORY $CHICKEN_UNINSTALL -force reverser
    406 CHICKEN_REPOSITORY=$CHICKEN_REPOSITORY $CHICKEN_INSTALL -t local -l $TEST_DIR reverser:1.0 \
    407  -csi ${TEST_DIR}/../csi
     410CHICKEN_REPOSITORY=$CHICKEN_REPOSITORY CSC_OPTIONS=$COMPILE_OPTIONS \
     411    CSI_OPTIONS=$SETUP_PREFIX $CHICKEN_INSTALL -t local -l $TEST_DIR \
     412    -csi ${TEST_DIR}/../csi reverser:1.0
    408413CHICKEN_REPOSITORY=$CHICKEN_REPOSITORY $interpret -bnq rev-app.scm 1.0
    409 CHICKEN_REPOSITORY=$CHICKEN_REPOSITORY $CHICKEN_INSTALL -t local -l $TEST_DIR -reinstall -force \
    410  -csi ${TEST_DIR}/../csi
     414CHICKEN_REPOSITORY=$CHICKEN_REPOSITORY CSC_OPTIONS=$COMPILE_OPTIONS \
     415    CSI_OPTIONS=$SETUP_PREFIX $CHICKEN_INSTALL -t local -l $TEST_DIR \
     416    -reinstall -force -csi ${TEST_DIR}/../csi
    411417CHICKEN_REPOSITORY=$CHICKEN_REPOSITORY $interpret -bnq rev-app.scm 1.0
    412418
    413419echo "======================================== deployment tests"
    414420mkdir rev-app
    415 CHICKEN_REPOSITORY=$CHICKEN_REPOSITORY $CHICKEN_INSTALL -t local -l $TEST_DIR reverser
     421CHICKEN_REPOSITORY=$CHICKEN_REPOSITORY CSC_OPTIONS=$COMPILE_OPTIONS \
     422    CSI_OPTIONS=$SETUP_PREFIX $CHICKEN_INSTALL -t local -l $TEST_DIR \
     423    -csi ${TEST_DIR}/../csi reverser
    416424CHICKEN_REPOSITORY=$CHICKEN_REPOSITORY $compile2 -deploy rev-app.scm
    417 CHICKEN_REPOSITORY=$CHICKEN_REPOSITORY $CHICKEN_INSTALL -deploy -prefix rev-app -t local -l $TEST_DIR reverser
     425CHICKEN_REPOSITORY=$CHICKEN_REPOSITORY CSC_OPTIONS=$COMPILE_OPTIONS \
     426    CSI_OPTIONS=$SETUP_PREFIX $CHICKEN_INSTALL -deploy -prefix rev-app \
     427    -t local -l $TEST_DIR reverser
    418428unset LD_LIBRARY_PATH DYLD_LIBRARY_PATH CHICKEN_REPOSITORY
    419429rev-app/rev-app 1.1
    420430mv rev-app rev-app-2