Index: tests/installall/runconfigs.config ================================================================== --- tests/installall/runconfigs.config +++ tests/installall/runconfigs.config @@ -1,10 +1,11 @@ [miscvars] [default] ALLTESTS see this variable PREFIX #{getenv MT_RUN_AREA_HOME}/#{getenv CONFIGURATION}/#{getenv MT_RUNNAME} +DOWNLOADS #{getenv MT_RUN_AREA_HOME}/downloads [stdrel] CHICKEN_VERSION 4.8.0 IUPLIB 26g4 IUP_VERSION na Index: tests/installall/tests/chicken/download.sh ================================================================== --- tests/installall/tests/chicken/download.sh +++ tests/installall/tests/chicken/download.sh @@ -2,14 +2,14 @@ # 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 +if ! [[ -e ${DOWNLOADS}/chicken-${CHICKEN_VERSION}.tar.gz ]]; then + (cd ${DOWNLOADS};wget http://code.call-cc.org/releases/${CHICKEN_VERSION}/chicken-${CHICKEN_VERSION}.tar.gz) fi -ls -l chicken-${CHICKEN_VERSION}.tar.gz +ls -l ${DOWNLOADS}/chicken-${CHICKEN_VERSION}.tar.gz -tar xfvz chicken-${CHICKEN_VERSION}.tar.gz +tar xfvz ${DOWNLOADS}/chicken-${CHICKEN_VERSION}.tar.gz ls -l chicken-${CHICKEN_VERSION} Index: tests/installall/tests/ffcall/download.sh ================================================================== --- tests/installall/tests/ffcall/download.sh +++ tests/installall/tests/ffcall/download.sh @@ -2,12 +2,12 @@ # Run your step here source $PREFIX/buildsetup.sh -if ! [[ -e ffcall.tar.gz ]] ; then - wget http://www.kiatoa.com/matt/iup/ffcall.tar.gz +if ! [[ -e i${DOWNLOADS}/ffcall.tar.gz ]] ; then + (cd ${DOWNLOADS};wget http://www.kiatoa.com/matt/iup/ffcall.tar.gz ) fi -tar xfvz ffcall.tar.gz +tar xfvz ${DOWNLOADS}/ffcall.tar.gz ls -l ffcall 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 setup +waiton iuplib tougheggs # 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.sh ================================================================== --- tests/installall/tests/iuplib/download.sh +++ tests/installall/tests/iuplib/download.sh @@ -17,12 +17,12 @@ 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 + if ! [[ -e ${DOWNLOADS}/$a ]] ; then + (cd ${DOWNLOADS};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) + (cd $PREFIX/lib;tar xfvz ${DOWNLOADS}/$a;mv include/* ../include) done Index: tests/installall/tests/setup/setup.sh ================================================================== --- tests/installall/tests/setup/setup.sh +++ tests/installall/tests/setup/setup.sh @@ -4,10 +4,12 @@ cksetupsh=$PREFIX/setup-chicken4x.sh cksetupcsh=$PREFIX/setup-chicken4x.csh setupsh=$PREFIX/buildsetup.sh +# make a cache dir +mkdir -p $DOWNLOADS mkdir -p $PREFIX # File for users to source to run chicken echo "# Source me to setup to to run chicken" > $cksetupsh echo "export PATH=$PREFIX/bin:\$PATH" > $cksetupsh Index: tests/installall/tests/sqlite3/download.sh ================================================================== --- tests/installall/tests/sqlite3/download.sh +++ tests/installall/tests/sqlite3/download.sh @@ -3,12 +3,12 @@ # 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 +if ! [[ -e ${DOWNLOADS}/sqlite-autoconf-${SQLITE3_VERSION}.tar.gz ]]; then + (cd ${DOWNLOADS};wget http://www.sqlite.org/sqlite-autoconf-${SQLITE3_VERSION}.tar.gz) fi -tar xfz sqlite-autoconf-${SQLITE3_VERSION}.tar.gz +tar xfz ${DOWNLOADS}/sqlite-autoconf-${SQLITE3_VERSION}.tar.gz ls -l sqlite-autoconf-${SQLITE3_VERSION}.tar.gz 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 setup +waiton tougheggs priority 2 # Iteration for your tests are controlled by the items section [items]