Index: mkdeploy/megatest.config ================================================================== --- mkdeploy/megatest.config +++ mkdeploy/megatest.config @@ -1,15 +1,16 @@ [fields] PLATFORM TEXT OS TEXT +OSVER TEXT [setup] # Adjust max_concurrent_jobs to limit parallel jobs -max_concurrent_jobs 50 +max_concurrent_jobs 10 # This is your link path, best to set it and then not change it -linktree #{getenv PWD}/linktree +linktree #{getenv MT_RUN_AREA_HOME}/linktree # Job tools control how your jobs are launched [jobtools] useshell yes launcher nbfind @@ -16,12 +17,12 @@ # As you run more tests you may need to add additional disks # the names are arbitrary but must be unique # [disks] -disk0 #{getenv PWD}/runs +disk0 #{getenv MT_RUN_AREA_HOME}/runs # put env-override last so definitions in site.config by default # are added as env-override variables # [env-override] [include site.config] Index: mkdeploy/tests/eggs/install.logpro ================================================================== --- mkdeploy/tests/eggs/install.logpro +++ mkdeploy/tests/eggs/install.logpro @@ -1,3 +1,5 @@ -(expect:error in "LogFileBody" = 0 "Any error" #/err/i) -(expect:required in "LogFileBody" = 1 "Sucess signature" #/adequate space/) +(expect:ignore in "LogFileBody" >= 0 "ignore setup-error-handling" #/setup-error-handling/) +(expect:ignore in "LogFileBody" >= 0 "ignore check-errors" (list #/check-errors/ #/type-errors/ #/srfi-4-errors/)) +(expect:error in "LogFileBody" = 0 "Any error" #/error/i) +(expect:required in "LogFileBody" = 1 "Sucess signature" #/DONE/) Index: mkdeploy/tests/eggs/install.sh ================================================================== --- mkdeploy/tests/eggs/install.sh +++ mkdeploy/tests/eggs/install.sh @@ -1,8 +1,4 @@ #!/bin/bash -e -freespace=`df -k /$DIRECTORY | grep $DIRECTORY | awk '{print $4}'` -if [[ $freespace -lt $REQUIRED ]];then - echo "ERROR: insufficient space on /$DIRECTORY" - exit 1 -else - echo "There is adequate space on /$DIRECTORY" -fi + +chicken-install -prefix ../deploytarg -deploy $EGGNAME +echo DONE Index: mkdeploy/tests/eggs/testconfig ================================================================== --- mkdeploy/tests/eggs/testconfig +++ mkdeploy/tests/eggs/testconfig @@ -1,11 +1,12 @@ # Add steps here. Format is "stepname script" [ezsteps] install install.sh +[requirements] +waiton executables + # Iteration for your tests are controlled by the items section # However it is impractical to code the actual directory here # so use names here and dereference to variables in runconfigs -[itemstable] -DIRECTORY tmp opt runs -REQUIRED 100000 100000 1000000 - +[items] +EGGNAME apropos base64 canvas-draw csv-xml directory-utils dot-locking extras fmt format hostinfo http-client intarweb json md5 message-digest posix posix-extras readline regex regex-case s11n spiffy spiffy-request-vars sqlite3 srfi-1 srfi-18 srfi-69 tcp test uri-common zmq check-errors synch matchable sql-null tcp-server rpc blob-utils string-utils variable-item defstruct uri-generic sendfile openssl lookup-table list-utils stack ADDED mkdeploy/tests/executables/addlibs.logpro Index: mkdeploy/tests/executables/addlibs.logpro ================================================================== --- /dev/null +++ mkdeploy/tests/executables/addlibs.logpro @@ -0,0 +1,3 @@ +(expect:error in "LogFileBody" = 0 "Any error" #/err/i) +(expect:required in "LogFileBody" = 1 "Sucess signature" #/libchicken.so.6/) + ADDED mkdeploy/tests/executables/addlibs.sh Index: mkdeploy/tests/executables/addlibs.sh ================================================================== --- /dev/null +++ mkdeploy/tests/executables/addlibs.sh @@ -0,0 +1,10 @@ +#!/bin/bash -e + +CSIPATH=$(echo $(type csi)|awk '{print $3}') +CKPATH=$(dirname $(dirname $CSIPATH)) +rsync -av $EXECUTABLE/ ../deploytarg/ +for i in iup im cd av call sqlite; do + cp $(CKPATH)/lib/lib$i* ../deploytarg/ +done + +cp $(CKPATH)/include/*.h ../deploytarg/ Index: mkdeploy/tests/executables/install.logpro ================================================================== --- mkdeploy/tests/executables/install.logpro +++ mkdeploy/tests/executables/install.logpro @@ -1,3 +1,3 @@ (expect:error in "LogFileBody" = 0 "Any error" #/err/i) -(expect:required in "LogFileBody" = 1 "Sucess signature" #/adequate space/) +(expect:required in "LogFileBody" = 1 "Sucess signature" #/libchicken.so.6/) Index: mkdeploy/tests/executables/install.sh ================================================================== --- mkdeploy/tests/executables/install.sh +++ mkdeploy/tests/executables/install.sh @@ -1,5 +1,7 @@ #!/bin/bash -e -cd $BUILDDIR +unset LD_LIBRARY_PATH +rm -rf $EXECUTABLE +mkdir $EXECUTABLE csc -deploy $EXECUTABLE - +ls $EXECUTABLE ADDED mkdeploy/tests/executables/linksrc.logpro Index: mkdeploy/tests/executables/linksrc.logpro ================================================================== --- /dev/null +++ mkdeploy/tests/executables/linksrc.logpro @@ -0,0 +1,3 @@ +(expect:error in "LogFileBody" = 0 "Any error" #/err/i) +(expect:required in "LogFileBody" = 1 "Sucess signature" #/Makefile/) + ADDED mkdeploy/tests/executables/linksrc.sh Index: mkdeploy/tests/executables/linksrc.sh ================================================================== --- /dev/null +++ mkdeploy/tests/executables/linksrc.sh @@ -0,0 +1,6 @@ +#!/bin/bash -e + +rm -f *.scm *.o Makefile +ln -s $BUILDDIR/*.scm . +ln -s $BUILDDIR/Makefile . +ls Makefile *.scm ADDED mkdeploy/tests/executables/make_mt.logpro Index: mkdeploy/tests/executables/make_mt.logpro ================================================================== --- /dev/null +++ mkdeploy/tests/executables/make_mt.logpro @@ -0,0 +1,3 @@ +(expect:error in "LogFileBody" = 0 "Any error" #/err/i) +(expect:required in "LogFileBody" = 1 "Sucess signature" #/mtest/) + Index: mkdeploy/tests/executables/testconfig ================================================================== --- mkdeploy/tests/executables/testconfig +++ mkdeploy/tests/executables/testconfig @@ -1,8 +1,11 @@ # Add steps here. Format is "stepname script" [ezsteps] +linksrc linksrc.sh +make_mt make install install.sh +addlibs addlibs.sh # Iteration for your tests are controlled by the items section # However it is impractical to code the actual directory here # so use names here and dereference to variables in runconfigs [itemstable]