Index: .fossil-settings/ignore-glob ================================================================== --- .fossil-settings/ignore-glob +++ .fossil-settings/ignore-glob @@ -14,10 +14,11 @@ example/linktree example/runs *.backup mkdeploy/linktree mkdeploy/site.config +deploytarg/* mtest newdboard *.log fslsync/fslsynclinks/* fslsync/fslsyncruns/* @@ -27,5 +28,16 @@ *.bak simplerun/*.scm simplerun/simpleruns tests/mintest/runs/* tests/mintest/linktree/* +tests/installall/stdrel/* +tests/installall/runs/* +tests/installall/links/* +tests/fdktestqa/simpleruns/* +tests/installall/megatest.db +tests/installall/monitor.db +tests/megatest.db +tests/fdktestqa/simplelinks/* +tests/fdktestqa/testqa/megatest.db +tests/fdktestqa/testqa/monitor.db +megatest-fossil-hash.scm ADDED docs/manual_running_of_tests.png Index: docs/manual_running_of_tests.png ================================================================== --- /dev/null +++ docs/manual_running_of_tests.png cannot compute difference between binary files Index: tests/installall/megatest.config ================================================================== --- tests/installall/megatest.config +++ tests/installall/megatest.config @@ -1,17 +1,17 @@ [fields] CONFIGURATION TEXT [setup] max_concurrent_jobs 50 -linktree $PWD/links +linktree #{getenv MT_RUN_AREA_HOME}/links [jobtools] useshell yes launcher nbfind [env-override] EXAMPLE_VAR example value [disks] -disk0 $PWD/runs +disk0 #{getenv MT_RUN_AREA_HOME}/runs Index: tests/installall/runconfigs.config ================================================================== --- tests/installall/runconfigs.config +++ tests/installall/runconfigs.config @@ -1,7 +1,12 @@ +[miscvars] + [default] ALLTESTS see this variable +PROX #{scheme (if (get-environment-variable "proxy") (conc "-proxy " (get-environment-variable "proxy")) "")} +http_proxy #{scheme (if (get-environment-variable "proxy") (conc "http://" (get-environment-variable "proxy")) "")} +PREFIX #{getenv MT_RUN_AREA_HOME}/#{getenv CONFIGURATION}/#{getenv MT_RUNNAME} [stdrel] CHICKEN_VERSION 4.8.0 IUPLIB 26g4 IUP_VERSION na Index: tests/installall/tests/canvas-draw/testconfig ================================================================== --- tests/installall/tests/canvas-draw/testconfig +++ tests/installall/tests/canvas-draw/testconfig @@ -3,11 +3,10 @@ install install.sh # Test requirements are specified here [requirements] waiton iuplib -priority # Iteration for your tests are controlled by the items section [items] # test_meta is a section for storing additional data on your test Index: tests/installall/tests/chicken/compile.logpro ================================================================== --- tests/installall/tests/chicken/compile.logpro +++ tests/installall/tests/chicken/compile.logpro @@ -1,8 +1,10 @@ ;; You should have at least one expect:required. This ensures that your process ran -(expect:required in "LogFileBody" > 0 "Put description here" #/put pattern here/) +(expect:required in "LogFileBody" > 0 "Leaving directory ..." #/Leaving directory/) ;; You may need ignores to suppress false error or warning hits from the later expects ;; NOTE: Order is important here! (expect:ignore in "LogFileBody" < 99 "Ignore the word error in comments" #/^\/\/.*error/) +(expect:ignore in "LogFileBody" >= 0 "Ignore HAVE_STRERROR" #/HAVE_STRERROR/) + (expect:warning in "LogFileBody" = 0 "Any warning" #/warn/) (expect:error in "LogFileBody" = 0 "Any error" (list #/ERROR/ #/error/)) ;; but disallow any other errors Index: tests/installall/tests/chicken/compile.sh ================================================================== --- tests/installall/tests/chicken/compile.sh +++ tests/installall/tests/chicken/compile.sh @@ -1,3 +1,5 @@ #!/usr/bin/env bash # Run your step here +cd chicken-${CHICKEN_VERSION} +make PLATFORM=${PLATFORM} PREFIX=${PREFIX} Index: tests/installall/tests/chicken/download.logpro ================================================================== --- tests/installall/tests/chicken/download.logpro +++ tests/installall/tests/chicken/download.logpro @@ -1,8 +1,11 @@ ;; You should have at least one expect:required. This ensures that your process ran -(expect:required in "LogFileBody" > 0 "Put description here" #/put pattern here/) +(expect:required in "LogFileBody" > 0 "README file must be seen" #/README$/) ;; You may need ignores to suppress false error or warning hits from the later expects ;; NOTE: Order is important here! + +(expect:ignore in "LogFileBody" >= 0 "Ignore error flagged by finalizer-error-test" #/finalizer-error-test/) + (expect:ignore in "LogFileBody" < 99 "Ignore the word error in comments" #/^\/\/.*error/) (expect:warning in "LogFileBody" = 0 "Any warning" #/warn/) (expect:error in "LogFileBody" = 0 "Any error" (list #/ERROR/ #/error/)) ;; but disallow any other errors Index: tests/installall/tests/chicken/download.sh ================================================================== --- tests/installall/tests/chicken/download.sh +++ tests/installall/tests/chicken/download.sh @@ -1,3 +1,13 @@ #!/usr/bin/env bash # Run your step here + +if ! [[ -e chicken-${CHICKEN_VERSION}.tar.gz ]]; then + wget http://code.call-cc.org/releases/${CHICKEN_VERSION}/chicken-${CHICKEN_VERSION}.tar.gz +fi + +ls -l chicken-${CHICKEN_VERSION}.tar.gz + +tar xfvz chicken-${CHICKEN_VERSION}.tar.gz + +ls -l chicken-${CHICKEN_VERSION} Index: tests/installall/tests/chicken/install.logpro ================================================================== --- tests/installall/tests/chicken/install.logpro +++ tests/installall/tests/chicken/install.logpro @@ -1,8 +1,11 @@ ;; You should have at least one expect:required. This ensures that your process ran -(expect:required in "LogFileBody" > 0 "Put description here" #/put pattern here/) +(expect:required in "LogFileBody" > 0 "Leaving directory" #/Leaving directory/) ;; You may need ignores to suppress false error or warning hits from the later expects ;; NOTE: Order is important here! + +(expect:ignore in "LogFileBody" >= 0 "Ignore error in some filenames" #/(check-errors|srfi-4-errors)/) + (expect:ignore in "LogFileBody" < 99 "Ignore the word error in comments" #/^\/\/.*error/) (expect:warning in "LogFileBody" = 0 "Any warning" #/warn/) (expect:error in "LogFileBody" = 0 "Any error" (list #/ERROR/ #/error/)) ;; but disallow any other errors Index: tests/installall/tests/chicken/install.sh ================================================================== --- tests/installall/tests/chicken/install.sh +++ tests/installall/tests/chicken/install.sh @@ -1,3 +1,14 @@ #!/usr/bin/env bash # Run your step here + +cd chicken-${CHICKEN_VERSION} +make PLATFORM=${PLATFORM} PREFIX=${PREFIX} install + +echo "export PATH=$PREFIX/bin:\$PATH" > $PREFIX/setup-chicken4x.sh +echo "export LD_LIBRARY_PATH=$LD_LIBRARY_PATH" >> $PREFIX/setup-chicken4x.sh + +echo "setenv PATH $PREFIX/bin:\$PATH" > $PREFIX/setup-chicken4x.csh +echo "setenv LD_LIBRARY_PATH $LD_LIBRARY_PATH" >> $PREFIX/setup-chicken4x.csh + +ls -l ${PREFIX}/bin Index: tests/installall/tests/chicken/testconfig ================================================================== --- tests/installall/tests/chicken/testconfig +++ tests/installall/tests/chicken/testconfig @@ -1,19 +1,18 @@ # Add additional steps here. Format is "stepname script" [ezsteps] -download download -compile compile -install install +download download.sh +compile compile.sh +install install.sh # Test requirements are specified here [requirements] -waiton -priority +priority 10 # Iteration for your tests are controlled by the items section [items] -CHICKEN_VERSION 4.8.0 +# CHICKEN_VERSION 4.8.0 # test_meta is a section for storing additional data on your test [test_meta] author matt owner matt Index: tests/installall/tests/eggs/install.logpro ================================================================== --- tests/installall/tests/eggs/install.logpro +++ tests/installall/tests/eggs/install.logpro @@ -1,8 +1,9 @@ ;; You should have at least one expect:required. This ensures that your process ran -(expect:required in "LogFileBody" > 0 "Put description here" #/put pattern here/) +(expect:required in "LogFileBody" > 0 "Last thing done is chmod ..." #/chmod /) ;; You may need ignores to suppress false error or warning hits from the later expects ;; NOTE: Order is important here! +(expect:ignore in "LogFileBody" >= 0 "Ignore setup-error-handling" #/setup-error-handling/) (expect:ignore in "LogFileBody" < 99 "Ignore the word error in comments" #/^\/\/.*error/) (expect:warning in "LogFileBody" = 0 "Any warning" #/warn/) (expect:error in "LogFileBody" = 0 "Any error" (list #/ERROR/ #/error/)) ;; but disallow any other errors Index: tests/installall/tests/eggs/install.sh ================================================================== --- tests/installall/tests/eggs/install.sh +++ tests/installall/tests/eggs/install.sh @@ -1,3 +1,5 @@ #!/usr/bin/env bash # Run your step here + +$PREFIX/bin/chicken-install $EGG_NAME Index: tests/installall/tests/eggs/testconfig ================================================================== --- tests/installall/tests/eggs/testconfig +++ tests/installall/tests/eggs/testconfig @@ -1,17 +1,17 @@ # Add additional steps here. Format is "stepname script" [ezsteps] -install.sh install.sh +install install.sh # Test requirements are specified here [requirements] waiton chicken -priority +priority 9 # Iteration for your tests are controlled by the items section [items] -EGG_NAME matchable readline apropos base64 regex-literals format "regex-case" "test" coops trace csv dot-locking posix-utils posix-extras directory-utils hostinfo tcp rpc csv-xml fmt json md5 +EGG_NAME matchable readline apropos base64 regex-literals format regex-case test coops trace csv dot-locking posix-utils posix-extras directory-utils hostinfo tcp-server rpc csv-xml fmt json md5 # test_meta is a section for storing additional data on your test [test_meta] author matt owner matt Index: tests/installall/tests/ffcall/compile.logpro ================================================================== --- tests/installall/tests/ffcall/compile.logpro +++ tests/installall/tests/ffcall/compile.logpro @@ -1,7 +1,7 @@ ;; You should have at least one expect:required. This ensures that your process ran -(expect:required in "LogFileBody" > 0 "Put description here" #/put pattern here/) +(expect:required in "LogFileBody" > 0 "Leaving directory" #/Leaving directory/) ;; You may need ignores to suppress false error or warning hits from the later expects ;; NOTE: Order is important here! (expect:ignore in "LogFileBody" < 99 "Ignore the word error in comments" #/^\/\/.*error/) (expect:warning in "LogFileBody" = 0 "Any warning" #/warn/) Index: tests/installall/tests/ffcall/compile.sh ================================================================== --- tests/installall/tests/ffcall/compile.sh +++ tests/installall/tests/ffcall/compile.sh @@ -1,3 +1,6 @@ #!/usr/bin/env bash # Run your step here +cd ffcall +./configure --prefix=${PREFIX} --enable-shared +make Index: tests/installall/tests/ffcall/download.logpro ================================================================== --- tests/installall/tests/ffcall/download.logpro +++ tests/installall/tests/ffcall/download.logpro @@ -1,7 +1,7 @@ ;; You should have at least one expect:required. This ensures that your process ran -(expect:required in "LogFileBody" > 0 "Put description here" #/put pattern here/) +(expect:required in "LogFileBody" > 0 "VERSION" #/ VERSION/) ;; You may need ignores to suppress false error or warning hits from the later expects ;; NOTE: Order is important here! (expect:ignore in "LogFileBody" < 99 "Ignore the word error in comments" #/^\/\/.*error/) (expect:warning in "LogFileBody" = 0 "Any warning" #/warn/) Index: tests/installall/tests/ffcall/download.sh ================================================================== --- tests/installall/tests/ffcall/download.sh +++ tests/installall/tests/ffcall/download.sh @@ -1,3 +1,11 @@ #!/usr/bin/env bash # Run your step here + +if ! [[ -e ffcall.tar.gz ]] ; then + wget http://www.kiatoa.com/matt/iup/ffcall.tar.gz +fi + +tar xfvz ffcall.tar.gz + +ls -l ffcall Index: tests/installall/tests/ffcall/install.logpro ================================================================== --- tests/installall/tests/ffcall/install.logpro +++ tests/installall/tests/ffcall/install.logpro @@ -1,7 +1,7 @@ ;; You should have at least one expect:required. This ensures that your process ran -(expect:required in "LogFileBody" > 0 "Put description here" #/put pattern here/) +(expect:required in "LogFileBody" > 0 "Leaving directory" #/Leaving directory/) ;; You may need ignores to suppress false error or warning hits from the later expects ;; NOTE: Order is important here! (expect:ignore in "LogFileBody" < 99 "Ignore the word error in comments" #/^\/\/.*error/) (expect:warning in "LogFileBody" = 0 "Any warning" #/warn/) Index: tests/installall/tests/ffcall/install.sh ================================================================== --- tests/installall/tests/ffcall/install.sh +++ tests/installall/tests/ffcall/install.sh @@ -1,3 +1,5 @@ #!/usr/bin/env bash # Run your step here +cd ffcall +make install Index: tests/installall/tests/ffcall/testconfig ================================================================== --- tests/installall/tests/ffcall/testconfig +++ tests/installall/tests/ffcall/testconfig @@ -1,16 +1,13 @@ # Add additional steps here. Format is "stepname script" [ezsteps] -download download -untar untar -compile compile -install install +download download.sh +compile compile.sh +install install.sh # Test requirements are specified here [requirements] -waiton -priority # Iteration for your tests are controlled by the items section [items] # test_meta is a section for storing additional data on your test DELETED tests/installall/tests/ffcall/untar.logpro Index: tests/installall/tests/ffcall/untar.logpro ================================================================== --- tests/installall/tests/ffcall/untar.logpro +++ /dev/null @@ -1,8 +0,0 @@ -;; You should have at least one expect:required. This ensures that your process ran -(expect:required in "LogFileBody" > 0 "Put description here" #/put pattern here/) - -;; You may need ignores to suppress false error or warning hits from the later expects -;; NOTE: Order is important here! -(expect:ignore in "LogFileBody" < 99 "Ignore the word error in comments" #/^\/\/.*error/) -(expect:warning in "LogFileBody" = 0 "Any warning" #/warn/) -(expect:error in "LogFileBody" = 0 "Any error" (list #/ERROR/ #/error/)) ;; but disallow any other errors DELETED tests/installall/tests/ffcall/untar.sh Index: tests/installall/tests/ffcall/untar.sh ================================================================== --- tests/installall/tests/ffcall/untar.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -# Run your step here Index: tests/installall/tests/iup/install.logpro ================================================================== --- tests/installall/tests/iup/install.logpro +++ tests/installall/tests/iup/install.logpro @@ -1,8 +1,9 @@ ;; You should have at least one expect:required. This ensures that your process ran -(expect:required in "LogFileBody" > 0 "Put description here" #/put pattern here/) +(expect:required in "LogFileBody" > 0 "chmod is roughly last thing that happens" #/chmod /) ;; You may need ignores to suppress false error or warning hits from the later expects ;; NOTE: Order is important here! +(expect:ignore in "LogFileBody" >= 0 "Ignore setup-error-handling" #/setup-error-handling/) (expect:ignore in "LogFileBody" < 99 "Ignore the word error in comments" #/^\/\/.*error/) (expect:warning in "LogFileBody" = 0 "Any warning" #/warn/) (expect:error in "LogFileBody" = 0 "Any error" (list #/ERROR/ #/error/)) ;; but disallow any other errors Index: tests/installall/tests/iup/install.sh ================================================================== --- tests/installall/tests/iup/install.sh +++ tests/installall/tests/iup/install.sh @@ -1,3 +1,11 @@ #!/usr/bin/env bash # Run your step here +source $PREFIX/setup-chicken4x.sh + +export CSCLIBS=`echo $LD_LIBRARY_PATH | sed 's/:/ -L/g'` +CSC_OPTIONS="-I$PREFIX/include -L$CSCLIBS" $PREFIX/bin/chicken-install $PROX -D no-library-checks -feature disable-iup-web iup +# CSC_OPTIONS="-I$PREFIX/include -L$CSCLIBS" $CHICKEN_INSTALL $PROX -D no-library-checks -feature disable-iup-web -deploy -prefix $DEPLOYTARG iup +# iup:1.0.2 +CSC_OPTIONS="-I$PREFIX/include -L$CSCLIBS" $PREFIX/bin/chicken-install $PROX -D no-library-checks canvas-draw +# CSC_OPTIONS="-I$PREFIX/include -L$CSCLIBS" $CHICKEN_INSTALL $PROX -D no-library-checks -deploy -prefix $DEPLOYTARG canvas-draw Index: tests/installall/tests/iup/testconfig ================================================================== --- tests/installall/tests/iup/testconfig +++ tests/installall/tests/iup/testconfig @@ -3,11 +3,10 @@ install install.sh # Test requirements are specified here [requirements] waiton iuplib -priority # Iteration for your tests are controlled by the items section [items] # test_meta is a section for storing additional data on your test Index: tests/installall/tests/iuplib/download.logpro ================================================================== --- tests/installall/tests/iuplib/download.logpro +++ tests/installall/tests/iuplib/download.logpro @@ -1,7 +1,7 @@ ;; You should have at least one expect:required. This ensures that your process ran -(expect:required in "LogFileBody" > 0 "Put description here" #/put pattern here/) +(expect:required in "LogFileBody" > 0 "README file should show up" #/README/) ;; You may need ignores to suppress false error or warning hits from the later expects ;; NOTE: Order is important here! (expect:ignore in "LogFileBody" < 99 "Ignore the word error in comments" #/^\/\/.*error/) (expect:warning in "LogFileBody" = 0 "Any warning" #/warn/) Index: tests/installall/tests/iuplib/download.sh ================================================================== --- tests/installall/tests/iuplib/download.sh +++ tests/installall/tests/iuplib/download.sh @@ -1,3 +1,27 @@ #!/usr/bin/env bash # Run your step here +source $PREFIX/setup-chicken4x.sh + +if [[ `uname -a | grep x86_64` == "" ]]; then + export ARCHSIZE='' +else + export ARCHSIZE=64_ +fi + # export files="cd-5.4.1_Linux${IUPLIB}_lib.tar.gz im-3.6.3_Linux${IUPLIB}_lib.tar.gz iup-3.5_Linux${IUPLIB}_lib.tar.gz" +if [[ x$USEOLDIUP == "x" ]];then + export files="cd-5.5.1_Linux${IUPLIB}_${ARCHSIZE}lib.tar.gz im-3.8_Linux${IUPLIB}_${ARCHSIZE}lib.tar.gz iup-3.6_Linux${IUPLIB}_${ARCHSIZE}lib.tar.gz" +else + echo WARNING: Using old IUP libraries + export files="cd-5.4.1_Linux${IUPLIB}_${ARCHSIZE}lib.tar.gz im-3.6.3_Linux${IUPLIB}_${ARCHSIZE}lib.tar.gz iup-3.5_Linux${IUPLIB}_${ARCHSIZE}lib.tar.gz" +fi + +mkdir -p $PREFIX/iuplib +for a in `echo $files` ; do + if ! [[ -e $a ]] ; then + wget http://www.kiatoa.com/matt/iup/$a + fi + echo Untarring $a into $PREFIX/lib + (cd $PREFIX/lib;tar xfvz $MT_TEST_RUN_DIR/$a;mv include/* ../include) +done + Index: tests/installall/tests/iuplib/testconfig ================================================================== --- tests/installall/tests/iuplib/testconfig +++ tests/installall/tests/iuplib/testconfig @@ -1,16 +1,12 @@ # Add additional steps here. Format is "stepname script" [ezsteps] download download.sh -untar untar.sh -compile compile.sh -install install.sh # Test requirements are specified here [requirements] -waiton -priority +waiton ffcall # Iteration for your tests are controlled by the items section [items] # test_meta is a section for storing additional data on your test Index: tests/installall/tests/logpro/testconfig ================================================================== --- tests/installall/tests/logpro/testconfig +++ tests/installall/tests/logpro/testconfig @@ -6,11 +6,10 @@ install install.sh # Test requirements are specified here [requirements] waiton eggs -priority # Iteration for your tests are controlled by the items section [items] # test_meta is a section for storing additional data on your test Index: tests/installall/tests/sqlite3/compile.logpro ================================================================== --- tests/installall/tests/sqlite3/compile.logpro +++ tests/installall/tests/sqlite3/compile.logpro @@ -1,8 +1,9 @@ ;; You should have at least one expect:required. This ensures that your process ran -(expect:required in "LogFileBody" > 0 "Put description here" #/put pattern here/) +(expect:required in "LogFileBody" > 0 "Leaving directory" #/(Leaving directory|Nothing to be done for)/) ;; You may need ignores to suppress false error or warning hits from the later expects ;; NOTE: Order is important here! +(expect:ignore in "LogFileBody" >= 0 "Ignore strerror_r" #/strerror_r/i) (expect:ignore in "LogFileBody" < 99 "Ignore the word error in comments" #/^\/\/.*error/) (expect:warning in "LogFileBody" = 0 "Any warning" #/warn/) (expect:error in "LogFileBody" = 0 "Any error" (list #/ERROR/ #/error/)) ;; but disallow any other errors Index: tests/installall/tests/sqlite3/compile.sh ================================================================== --- tests/installall/tests/sqlite3/compile.sh +++ tests/installall/tests/sqlite3/compile.sh @@ -1,3 +1,8 @@ #!/usr/bin/env bash # Run your step here + +cd sqlite-autoconf-$SQLITE3_VERSION +./configure --prefix=$PREFIX + +make Index: tests/installall/tests/sqlite3/download.logpro ================================================================== --- tests/installall/tests/sqlite3/download.logpro +++ tests/installall/tests/sqlite3/download.logpro @@ -1,7 +1,7 @@ ;; You should have at least one expect:required. This ensures that your process ran -(expect:required in "LogFileBody" > 0 "Put description here" #/put pattern here/) +(expect:required in "LogFileBody" > 0 "sqlite-autoconf" #/sqlite-autoconf/) ;; You may need ignores to suppress false error or warning hits from the later expects ;; NOTE: Order is important here! (expect:ignore in "LogFileBody" < 99 "Ignore the word error in comments" #/^\/\/.*error/) (expect:warning in "LogFileBody" = 0 "Any warning" #/warn/) Index: tests/installall/tests/sqlite3/download.sh ================================================================== --- tests/installall/tests/sqlite3/download.sh +++ tests/installall/tests/sqlite3/download.sh @@ -1,3 +1,12 @@ #!/usr/bin/env bash # Run your step here + +echo Install sqlite3 +if ! [[ -e sqlite-autoconf-${SQLITE3_VERSION}.tar.gz ]]; then + wget http://www.sqlite.org/sqlite-autoconf-${SQLITE3_VERSION}.tar.gz +fi + +tar xfz sqlite-autoconf-${SQLITE3_VERSION}.tar.gz + +ls -l sqlite-autoconf-${SQLITE3_VERSION}.tar.gz Index: tests/installall/tests/sqlite3/install.logpro ================================================================== --- tests/installall/tests/sqlite3/install.logpro +++ tests/installall/tests/sqlite3/install.logpro @@ -1,7 +1,7 @@ ;; You should have at least one expect:required. This ensures that your process ran -(expect:required in "LogFileBody" > 0 "Put description here" #/put pattern here/) +(expect:required in "LogFileBody" > 0 "Leaving directory" #/Leaving directory/) ;; You may need ignores to suppress false error or warning hits from the later expects ;; NOTE: Order is important here! (expect:ignore in "LogFileBody" < 99 "Ignore the word error in comments" #/^\/\/.*error/) (expect:warning in "LogFileBody" = 0 "Any warning" #/warn/) Index: tests/installall/tests/sqlite3/install.sh ================================================================== --- tests/installall/tests/sqlite3/install.sh +++ tests/installall/tests/sqlite3/install.sh @@ -1,3 +1,6 @@ #!/usr/bin/env bash # Run your step here +cd sqlite-autoconf-$SQLITE3_VERSION +make install + ADDED tests/installall/tests/sqlite3/installegg.logpro Index: tests/installall/tests/sqlite3/installegg.logpro ================================================================== --- /dev/null +++ tests/installall/tests/sqlite3/installegg.logpro @@ -0,0 +1,9 @@ +;; You should have at least one expect:required. This ensures that your process ran +(expect:required in "LogFileBody" > 0 "chmod sqlite3" #/chmod.*sqlite3/) + +;; You may need ignores to suppress false error or warning hits from the later expects +;; NOTE: Order is important here! +(expect:ignore in "LogFileBody" >= 0 "Ignore setup-error-handling" #/setup-error-handling/) +(expect:ignore in "LogFileBody" < 99 "Ignore the word error in comments" #/^\/\/.*error/) +(expect:warning in "LogFileBody" = 0 "Any warning" #/warn/) +(expect:error in "LogFileBody" = 0 "Any error" (list #/ERROR/ #/error/)) ;; but disallow any other errors ADDED tests/installall/tests/sqlite3/installegg.sh Index: tests/installall/tests/sqlite3/installegg.sh ================================================================== --- /dev/null +++ tests/installall/tests/sqlite3/installegg.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env bash + +# Run your step here + +CSC_OPTIONS="-I$PREFIX/include -L$PREFIX/lib" $PREFIX/bin/chicken-install $PROX sqlite3 Index: tests/installall/tests/sqlite3/testconfig ================================================================== --- tests/installall/tests/sqlite3/testconfig +++ tests/installall/tests/sqlite3/testconfig @@ -1,16 +1,18 @@ # Add additional steps here. Format is "stepname script" [ezsteps] download download.sh -untar untar.sh compile compile.sh install install.sh +installegg installegg.sh # Test requirements are specified here [requirements] -waiton -priority +# We waiton chicken because this one installs the egg. It would behove us to split this +# into two tests ... +waiton chicken +priority 2 # Iteration for your tests are controlled by the items section [items] # test_meta is a section for storing additional data on your test DELETED tests/installall/tests/sqlite3/untar.logpro Index: tests/installall/tests/sqlite3/untar.logpro ================================================================== --- tests/installall/tests/sqlite3/untar.logpro +++ /dev/null @@ -1,8 +0,0 @@ -;; You should have at least one expect:required. This ensures that your process ran -(expect:required in "LogFileBody" > 0 "Put description here" #/put pattern here/) - -;; You may need ignores to suppress false error or warning hits from the later expects -;; NOTE: Order is important here! -(expect:ignore in "LogFileBody" < 99 "Ignore the word error in comments" #/^\/\/.*error/) -(expect:warning in "LogFileBody" = 0 "Any warning" #/warn/) -(expect:error in "LogFileBody" = 0 "Any error" (list #/ERROR/ #/error/)) ;; but disallow any other errors DELETED tests/installall/tests/sqlite3/untar.sh Index: tests/installall/tests/sqlite3/untar.sh ================================================================== --- tests/installall/tests/sqlite3/untar.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -# Run your step here Index: tests/installall/tests/zmq/testconfig ================================================================== --- tests/installall/tests/zmq/testconfig +++ tests/installall/tests/zmq/testconfig @@ -3,11 +3,10 @@ install install.sh # Test requirements are specified here [requirements] waiton zmqlib chicken -priority # Iteration for your tests are controlled by the items section [items] # test_meta is a section for storing additional data on your test Index: tests/installall/tests/zmqlib/testconfig ================================================================== --- tests/installall/tests/zmqlib/testconfig +++ tests/installall/tests/zmqlib/testconfig @@ -6,11 +6,10 @@ install install.sh # Test requirements are specified here [requirements] waiton -priority # Iteration for your tests are controlled by the items section [items] # test_meta is a section for storing additional data on your test