Index: tests/installall/megatest.config ================================================================== --- tests/installall/megatest.config +++ tests/installall/megatest.config @@ -10,8 +10,11 @@ launcher nbfind [env-override] EXAMPLE_VAR example value +[server] +port 9080 + [disks] disk0 #{getenv MT_RUN_AREA_HOME}/runs Index: tests/installall/runconfigs.config ================================================================== --- tests/installall/runconfigs.config +++ tests/installall/runconfigs.config @@ -1,11 +1,9 @@ [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 Index: tests/installall/tests/canvas-draw/install.logpro ================================================================== --- tests/installall/tests/canvas-draw/install.logpro +++ tests/installall/tests/canvas-draw/install.logpro @@ -3,6 +3,6 @@ ;; 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 +(expect:error in "LogFileBody" = 0 "Any error" (list #/ERROR/ #/error/i)) ;; but disallow any other errors Index: tests/installall/tests/canvas-draw/install.sh ================================================================== --- tests/installall/tests/canvas-draw/install.sh +++ tests/installall/tests/canvas-draw/install.sh @@ -1,3 +1,5 @@ #!/usr/bin/env bash # Run your step here + +source $PREFIX/buildsetup.sh Index: tests/installall/tests/canvas-draw/testconfig ================================================================== --- tests/installall/tests/canvas-draw/testconfig +++ tests/installall/tests/canvas-draw/testconfig @@ -2,11 +2,11 @@ [ezsteps] install install.sh # Test requirements are specified here [requirements] -waiton iuplib +waiton iuplib setup # 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 @@ -5,6 +5,6 @@ ;; 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 +(expect:error in "LogFileBody" = 0 "Any error" (list #/ERROR/ #/error/i)) ;; 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,5 +1,8 @@ #!/usr/bin/env bash # Run your step here + +source $PREFIX/buildsetup.sh + 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 @@ -2,10 +2,10 @@ (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" >= 0 "Ignore error flagged by finalizer-error-test" #/\w+-error/) (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 +(expect:error in "LogFileBody" = 0 "Any error" (list #/ERROR/ #/error/i)) ;; 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,8 +1,10 @@ #!/usr/bin/env bash # Run your step here + +source $PREFIX/buildsetup.sh if ! [[ -e chicken-${CHICKEN_VERSION}.tar.gz ]]; then wget http://code.call-cc.org/releases/${CHICKEN_VERSION}/chicken-${CHICKEN_VERSION}.tar.gz fi Index: tests/installall/tests/chicken/install.logpro ================================================================== --- tests/installall/tests/chicken/install.logpro +++ tests/installall/tests/chicken/install.logpro @@ -2,10 +2,10 @@ (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" >= 0 "Ignore error in some filenames" #/\w+-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 +(expect:error in "LogFileBody" = 0 "Any error" (list #/ERROR/ #/error/i)) ;; 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,14 +1,11 @@ #!/usr/bin/env bash # Run your step here + +source $PREFIX/buildsetup.sh +# source $PREFIX 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 @@ -4,11 +4,12 @@ compile compile.sh install install.sh # Test requirements are specified here [requirements] -priority 10 +waiton setup +# priority 10 # Iteration for your tests are controlled by the items section [items] # CHICKEN_VERSION 4.8.0 Index: tests/installall/tests/eggs/install.logpro ================================================================== --- tests/installall/tests/eggs/install.logpro +++ tests/installall/tests/eggs/install.logpro @@ -1,11 +1,9 @@ ;; You should have at least one expect:required. This ensures that your process ran (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 srfi-4-errors" #/srfi-4-errors/) -(expect:ignore in "LogFileBody" >= 0 "Ignore setup-error-handling" #/setup-error-handling/) -(expect:ignore in "LogFileBody" >= 0 "Ignore check-errors" #/check-errors/) +(expect:ignore in "LogFileBody" >= 0 "Ignore someword-errors" #/\w+-error/) (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 +(expect:error in "LogFileBody" = 0 "Any error" (list #/ERROR/ #/error/i)) ;; 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,5 +1,8 @@ #!/usr/bin/env bash # Run your step here -$PREFIX/bin/chicken-install $EGG_NAME +source $PREFIX/buildsetup.sh + +$PREFIX/bin/chicken-install $PROX $EGG_NAME + Index: tests/installall/tests/eggs/testconfig ================================================================== --- tests/installall/tests/eggs/testconfig +++ tests/installall/tests/eggs/testconfig @@ -2,16 +2,16 @@ [ezsteps] install install.sh # Test requirements are specified here [requirements] -waiton chicken +waiton chicken setup 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-server 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 ssax sxml-serializer sxml-modifications # 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 @@ -3,6 +3,6 @@ ;; 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 +(expect:error in "LogFileBody" = 0 "Any error" (list #/ERROR/ #/error/i)) ;; but disallow any other errors Index: tests/installall/tests/ffcall/compile.sh ================================================================== --- tests/installall/tests/ffcall/compile.sh +++ tests/installall/tests/ffcall/compile.sh @@ -1,6 +1,9 @@ #!/usr/bin/env bash # Run your step here + +source $PREFIX/buildsetup.sh + 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 @@ -3,6 +3,6 @@ ;; 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 +(expect:error in "LogFileBody" = 0 "Any error" (list #/ERROR/ #/error/i)) ;; but disallow any other errors Index: tests/installall/tests/ffcall/download.sh ================================================================== --- tests/installall/tests/ffcall/download.sh +++ tests/installall/tests/ffcall/download.sh @@ -1,8 +1,10 @@ #!/usr/bin/env bash # Run your step here + +source $PREFIX/buildsetup.sh if ! [[ -e ffcall.tar.gz ]] ; then wget http://www.kiatoa.com/matt/iup/ffcall.tar.gz fi Index: tests/installall/tests/ffcall/install.logpro ================================================================== --- tests/installall/tests/ffcall/install.logpro +++ tests/installall/tests/ffcall/install.logpro @@ -3,6 +3,6 @@ ;; 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 +(expect:error in "LogFileBody" = 0 "Any error" (list #/ERROR/ #/error/i)) ;; but disallow any other errors Index: tests/installall/tests/ffcall/install.sh ================================================================== --- tests/installall/tests/ffcall/install.sh +++ tests/installall/tests/ffcall/install.sh @@ -1,5 +1,8 @@ #!/usr/bin/env bash # Run your step here + +source $PREFIX/buildsetup.sh + cd ffcall make install Index: tests/installall/tests/ffcall/testconfig ================================================================== --- tests/installall/tests/ffcall/testconfig +++ tests/installall/tests/ffcall/testconfig @@ -4,10 +4,11 @@ compile compile.sh install install.sh # Test requirements are specified here [requirements] +waiton setup # 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/iup/install.logpro ================================================================== --- tests/installall/tests/iup/install.logpro +++ tests/installall/tests/iup/install.logpro @@ -1,9 +1,9 @@ ;; You should have at least one expect:required. This ensures that your process ran (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" >= 0 "Ignore setup-error-handling" #/\w+-error/) (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 +(expect:error in "LogFileBody" = 0 "Any error" (list #/ERROR/ #/error/i)) ;; 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,9 +1,10 @@ #!/usr/bin/env bash # Run your step here -source $PREFIX/setup-chicken4x.sh +source $PREFIX/buildsetup.sh +# 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 Index: tests/installall/tests/iup/testconfig ================================================================== --- tests/installall/tests/iup/testconfig +++ tests/installall/tests/iup/testconfig @@ -2,11 +2,11 @@ [ezsteps] install install.sh # Test requirements are specified here [requirements] -waiton iuplib chicken +waiton iuplib chicken setup # 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/compile.logpro ================================================================== --- tests/installall/tests/iuplib/compile.logpro +++ tests/installall/tests/iuplib/compile.logpro @@ -3,6 +3,6 @@ ;; 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 +(expect:error in "LogFileBody" = 0 "Any error" (list #/ERROR/ #/error/i)) ;; but disallow any other errors Index: tests/installall/tests/iuplib/compile.sh ================================================================== --- tests/installall/tests/iuplib/compile.sh +++ tests/installall/tests/iuplib/compile.sh @@ -1,3 +1,5 @@ #!/usr/bin/env bash # Run your step here + +source $PREFIX/buildsetup.sh Index: tests/installall/tests/iuplib/download.logpro ================================================================== --- tests/installall/tests/iuplib/download.logpro +++ tests/installall/tests/iuplib/download.logpro @@ -3,6 +3,6 @@ ;; 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 +(expect:error in "LogFileBody" = 0 "Any error" (list #/ERROR/ #/error/i)) ;; but disallow any other errors Index: tests/installall/tests/iuplib/download.sh ================================================================== --- tests/installall/tests/iuplib/download.sh +++ tests/installall/tests/iuplib/download.sh @@ -1,9 +1,10 @@ #!/usr/bin/env bash # Run your step here -source $PREFIX/setup-chicken4x.sh +source $PREFIX/buildsetup.sh +# source $PREFIX/setup-chicken4x.sh if [[ `uname -a | grep x86_64` == "" ]]; then export ARCHSIZE='' else export ARCHSIZE=64_ Index: tests/installall/tests/iuplib/install.logpro ================================================================== --- tests/installall/tests/iuplib/install.logpro +++ tests/installall/tests/iuplib/install.logpro @@ -3,6 +3,6 @@ ;; 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 +(expect:error in "LogFileBody" = 0 "Any error" (list #/ERROR/ #/error/i)) ;; but disallow any other errors Index: tests/installall/tests/iuplib/install.sh ================================================================== --- tests/installall/tests/iuplib/install.sh +++ tests/installall/tests/iuplib/install.sh @@ -1,3 +1,4 @@ #!/usr/bin/env bash # Run your step here +source $PREFIX/buildsetup.sh Index: tests/installall/tests/iuplib/testconfig ================================================================== --- tests/installall/tests/iuplib/testconfig +++ tests/installall/tests/iuplib/testconfig @@ -2,11 +2,11 @@ [ezsteps] download download.sh # Test requirements are specified here [requirements] -waiton ffcall +waiton ffcall setup # 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/untar.logpro ================================================================== --- tests/installall/tests/iuplib/untar.logpro +++ tests/installall/tests/iuplib/untar.logpro @@ -3,6 +3,6 @@ ;; 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 +(expect:error in "LogFileBody" = 0 "Any error" (list #/ERROR/ #/error/i)) ;; but disallow any other errors Index: tests/installall/tests/iuplib/untar.sh ================================================================== --- tests/installall/tests/iuplib/untar.sh +++ tests/installall/tests/iuplib/untar.sh @@ -1,3 +1,4 @@ #!/usr/bin/env bash # Run your step here +source $PREFIX/buildsetup.sh Index: tests/installall/tests/logpro/clone.logpro ================================================================== --- tests/installall/tests/logpro/clone.logpro +++ tests/installall/tests/logpro/clone.logpro @@ -3,6 +3,6 @@ ;; 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 +(expect:error in "LogFileBody" = 0 "Any error" (list #/ERROR/ #/error/i)) ;; but disallow any other errors Index: tests/installall/tests/logpro/clone.sh ================================================================== --- tests/installall/tests/logpro/clone.sh +++ tests/installall/tests/logpro/clone.sh @@ -1,3 +1,4 @@ #!/usr/bin/env bash # Run your step here +source $PREFIX/buildsetup.sh Index: tests/installall/tests/logpro/compile.logpro ================================================================== --- tests/installall/tests/logpro/compile.logpro +++ tests/installall/tests/logpro/compile.logpro @@ -3,6 +3,6 @@ ;; 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 +(expect:error in "LogFileBody" = 0 "Any error" (list #/ERROR/ #/error/i)) ;; but disallow any other errors Index: tests/installall/tests/logpro/compile.sh ================================================================== --- tests/installall/tests/logpro/compile.sh +++ tests/installall/tests/logpro/compile.sh @@ -1,3 +1,4 @@ #!/usr/bin/env bash # Run your step here +source $PREFIX/buildsetup.sh Index: tests/installall/tests/logpro/install.logpro ================================================================== --- tests/installall/tests/logpro/install.logpro +++ tests/installall/tests/logpro/install.logpro @@ -3,6 +3,6 @@ ;; 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 +(expect:error in "LogFileBody" = 0 "Any error" (list #/ERROR/ #/error/i)) ;; but disallow any other errors Index: tests/installall/tests/logpro/install.sh ================================================================== --- tests/installall/tests/logpro/install.sh +++ tests/installall/tests/logpro/install.sh @@ -1,3 +1,4 @@ #!/usr/bin/env bash # Run your step here +source $PREFIX/buildsetup.sh Index: tests/installall/tests/logpro/open.logpro ================================================================== --- tests/installall/tests/logpro/open.logpro +++ tests/installall/tests/logpro/open.logpro @@ -3,6 +3,6 @@ ;; 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 +(expect:error in "LogFileBody" = 0 "Any error" (list #/ERROR/ #/error/i)) ;; but disallow any other errors Index: tests/installall/tests/logpro/open.sh ================================================================== --- tests/installall/tests/logpro/open.sh +++ tests/installall/tests/logpro/open.sh @@ -1,3 +1,4 @@ #!/usr/bin/env bash # Run your step here +source $PREFIX/buildsetup.sh Index: tests/installall/tests/logpro/testconfig ================================================================== --- tests/installall/tests/logpro/testconfig +++ tests/installall/tests/logpro/testconfig @@ -5,11 +5,11 @@ compile compile.sh install install.sh # Test requirements are specified here [requirements] -waiton eggs +waiton eggs setup # 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 @@ -4,6 +4,6 @@ ;; 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 +(expect:error in "LogFileBody" = 0 "Any error" (list #/ERROR/ #/error/i)) ;; 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,8 +1,10 @@ #!/usr/bin/env bash # Run your step here + +source $PREFIX/buildsetup.sh 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 @@ -3,6 +3,6 @@ ;; 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 +(expect:error in "LogFileBody" = 0 "Any error" (list #/ERROR/ #/error/i)) ;; but disallow any other errors Index: tests/installall/tests/sqlite3/download.sh ================================================================== --- tests/installall/tests/sqlite3/download.sh +++ tests/installall/tests/sqlite3/download.sh @@ -1,8 +1,10 @@ #!/usr/bin/env bash # Run your step here + +source $PREFIX/buildsetup.sh echo Install sqlite3 if ! [[ -e sqlite-autoconf-${SQLITE3_VERSION}.tar.gz ]]; then wget http://www.sqlite.org/sqlite-autoconf-${SQLITE3_VERSION}.tar.gz fi Index: tests/installall/tests/sqlite3/install.logpro ================================================================== --- tests/installall/tests/sqlite3/install.logpro +++ tests/installall/tests/sqlite3/install.logpro @@ -3,6 +3,6 @@ ;; 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 +(expect:error in "LogFileBody" = 0 "Any error" (list #/ERROR/ #/error/i)) ;; but disallow any other errors Index: tests/installall/tests/sqlite3/install.sh ================================================================== --- tests/installall/tests/sqlite3/install.sh +++ tests/installall/tests/sqlite3/install.sh @@ -1,6 +1,9 @@ #!/usr/bin/env bash # Run your step here + +source $PREFIX/buildsetup.sh + cd sqlite-autoconf-$SQLITE3_VERSION make install Index: tests/installall/tests/sqlite3/installegg.logpro ================================================================== --- tests/installall/tests/sqlite3/installegg.logpro +++ tests/installall/tests/sqlite3/installegg.logpro @@ -4,6 +4,6 @@ ;; 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 +(expect:error in "LogFileBody" = 0 "Any error" (list #/ERROR/ #/error/i)) ;; but disallow any other errors Index: tests/installall/tests/sqlite3/installegg.sh ================================================================== --- tests/installall/tests/sqlite3/installegg.sh +++ tests/installall/tests/sqlite3/installegg.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash # Run your step here + +source $PREFIX/buildsetup.sh 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 @@ -7,11 +7,11 @@ # Test requirements are specified here [requirements] # We waiton chicken because this one installs the egg. It would behove us to split this # into two tests ... -waiton chicken +waiton chicken setup priority 2 # Iteration for your tests are controlled by the items section [items] Index: tests/installall/tests/zmq/install.logpro ================================================================== --- tests/installall/tests/zmq/install.logpro +++ tests/installall/tests/zmq/install.logpro @@ -3,6 +3,6 @@ ;; 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 +(expect:error in "LogFileBody" = 0 "Any error" (list #/ERROR/ #/error/i)) ;; but disallow any other errors Index: tests/installall/tests/zmq/install.sh ================================================================== --- tests/installall/tests/zmq/install.sh +++ tests/installall/tests/zmq/install.sh @@ -1,3 +1,4 @@ #!/usr/bin/env bash # Run your step here +source $PREFIX/buildsetup.sh Index: tests/installall/tests/zmq/testconfig ================================================================== --- tests/installall/tests/zmq/testconfig +++ tests/installall/tests/zmq/testconfig @@ -2,11 +2,11 @@ [ezsteps] install install.sh # Test requirements are specified here [requirements] -waiton zmqlib chicken +waiton zmqlib chicken setup # 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/compile.logpro ================================================================== --- tests/installall/tests/zmqlib/compile.logpro +++ tests/installall/tests/zmqlib/compile.logpro @@ -3,6 +3,6 @@ ;; 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 +(expect:error in "LogFileBody" = 0 "Any error" (list #/ERROR/ #/error/i)) ;; but disallow any other errors Index: tests/installall/tests/zmqlib/compile.sh ================================================================== --- tests/installall/tests/zmqlib/compile.sh +++ tests/installall/tests/zmqlib/compile.sh @@ -1,3 +1,4 @@ #!/usr/bin/env bash # Run your step here +source $PREFIX/buildsetup.sh Index: tests/installall/tests/zmqlib/download.logpro ================================================================== --- tests/installall/tests/zmqlib/download.logpro +++ tests/installall/tests/zmqlib/download.logpro @@ -3,6 +3,6 @@ ;; 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 +(expect:error in "LogFileBody" = 0 "Any error" (list #/ERROR/ #/error/i)) ;; but disallow any other errors Index: tests/installall/tests/zmqlib/download.sh ================================================================== --- tests/installall/tests/zmqlib/download.sh +++ tests/installall/tests/zmqlib/download.sh @@ -1,3 +1,4 @@ #!/usr/bin/env bash # Run your step here +source $PREFIX/buildsetup.sh Index: tests/installall/tests/zmqlib/install.logpro ================================================================== --- tests/installall/tests/zmqlib/install.logpro +++ tests/installall/tests/zmqlib/install.logpro @@ -3,6 +3,6 @@ ;; 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 +(expect:error in "LogFileBody" = 0 "Any error" (list #/ERROR/ #/error/i)) ;; but disallow any other errors Index: tests/installall/tests/zmqlib/install.sh ================================================================== --- tests/installall/tests/zmqlib/install.sh +++ tests/installall/tests/zmqlib/install.sh @@ -1,3 +1,5 @@ #!/usr/bin/env bash # Run your step here + +source $PREFIX/buildsetup.sh Index: tests/installall/tests/zmqlib/testconfig ================================================================== --- tests/installall/tests/zmqlib/testconfig +++ tests/installall/tests/zmqlib/testconfig @@ -5,11 +5,11 @@ compile compile.sh install install.sh # Test requirements are specified here [requirements] -waiton +waiton setup # 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/untar.logpro ================================================================== --- tests/installall/tests/zmqlib/untar.logpro +++ tests/installall/tests/zmqlib/untar.logpro @@ -3,6 +3,6 @@ ;; 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 +(expect:error in "LogFileBody" = 0 "Any error" (list #/ERROR/ #/error/i)) ;; but disallow any other errors Index: tests/installall/tests/zmqlib/untar.sh ================================================================== --- tests/installall/tests/zmqlib/untar.sh +++ tests/installall/tests/zmqlib/untar.sh @@ -1,3 +1,4 @@ #!/usr/bin/env bash # Run your step here +source $PREFIX/buildsetup.sh Index: utils/installall.sh ================================================================== --- utils/installall.sh +++ utils/installall.sh @@ -82,11 +82,11 @@ cd $BUILDHOME fi # Some eggs are quoted since they are reserved to Bash # for f in 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; do -$CHICKEN_INSTALL $PROX -keep-installed 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 awful http-client spiffy uri-common intarweb http-client spiffy-request-vars +$CHICKEN_INSTALL $PROX -keep-installed 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 awful http-client spiffy uri-common intarweb http-client spiffy-request-vars spiffy-directory-listing ssax sxml-serializer sxml-modifications # if ! [[ -e $PREFIX/lib/chicken/6/$f.so ]];then # $CHICKEN_INSTALL $PROX $f # # $CHICKEN_INSTALL -deploy -prefix $DEPLOYTARG $PROX $f # else # echo Skipping install of egg $f as it is already installed