Index: utils/Makefile.installall ================================================================== --- utils/Makefile.installall +++ utils/Makefile.installall @@ -87,11 +87,11 @@ CSCLIBS=$(shell echo $(LD_LIBRARY_PATH) | sed 's/:/ -L/g') CSC_OPTIONS="-I$(PREFIX)/include -L$(CSCLIBS) -C \"-fPIC\"" # CSC_OPTIONS=-I$(PREFIX)/include -L$(CSCLIBS) -all : chkn eggs libiup logprobin $(PREFIX)/lib/sqlite3.so $(PREFIX)/bin/hs +all : chkn eggs libiup logprobin $(PREFIX)/lib/sqlite3.so $(PREFIX)/bin/hs $(PREFIX)/lib/chicken/7/mutils.so chkn : $(CHICKEN_INSTALL) eggs : $(EGGSOFILES) @@ -178,10 +178,13 @@ fossil clone http://www.kiatoa.com/fossils/opensrc opensrc.fossil opensrc/histstore/histstore.scm : opensrc.fossil mkdir -p opensrc cd opensrc;fossil open ../opensrc.fossil + +$(PREFIX)/lib/chicken/7/mutils.so : opensrc/histstore/histstore.scm + cd opensrc/mutils;chicken-install opensrc/histstore/hs : opensrc/histstore/histstore.scm chkn eggs $(PREFIX)/lib/sqlite3.so cd opensrc/histstore;$(PREFIX)/bin/csc histstore.scm -o hs $(PREFIX)/bin/hs : opensrc/histstore/hs Index: utils/mt_ezstep ================================================================== --- utils/mt_ezstep +++ utils/mt_ezstep @@ -1,11 +1,11 @@ #!/bin/bash usage="mt_ezstep stepname prevstepname command [args ...]" -if [ "$MT_CMDINFO" == "" ];then - if [ -e megatest.sh ];then +if [[ "$MT_CMDINFO" == "" ]];then + if [[ -e megatest.sh ]];then source megatest.sh else echo "ERROR: $0 should be run within a megatest test environment" echo "Usage: $usage" exit @@ -16,11 +16,11 @@ # DO NOT USE IN YOUR SCRIPTS! # # Call like this: # mt_ezstep stepname prevstepname command .... # -if [ "x$1" == "x" ];then +if [[ "x$1" == "x" ]];then echo "Usage: $usage" exit fi # Since the user may not have . on the path and since we are likely to want to @@ -34,19 +34,19 @@ allstatus=99 runstatus=99 logpropstatus=99 -prev_env=.ezsteps/${prevstepname}.sh -if [ -e $prev_env ];then +prev_env=".ezsteps/${prevstepname}.sh" +if [[ -e $prev_env ]];then source $prev_env fi # source the environment from the previous step if it exists # if a logpro file exists then use it otherwise just run the command, nb// was using 2>&1 -if [ -e ${stepname}.logpro ];then +if [[ -e ${stepname}.logpro ]];then # could do: $command 2>&1| tee ${stepname}.log | logpro ${stepname}.logpro ${stepname}.html &> /dev/null logprostatus=$? # $command 2>&1| logpro ${stepname}.logpro ${stepname}.html &> ${stepname}.log # allstatus=(${PIPESTATUS[0]} ${PIPESTATUS[1]}) @@ -60,19 +60,19 @@ fi # If the test exits with non-zero, we will record FAIL even if logpro # says it is a PASS -if [ $runstatus -ne 0 ]; then +if [[ $runstatus -ne 0 ]]; then exitstatus=$runstatus -elif [ $logprostatus -eq 0 ]; then +elif [[ $logprostatus -eq 0 ]]; then exitstatus=$logprostatus -elif [ $logprostatus -eq 2 ]; then +elif [[ $logprostatus -eq 2 ]]; then exitstatus=2 -elif [ $logprostatus -eq 1 ]; then +elif [[ $logprostatus -eq 1 ]]; then exitstatus=1 else exitstatus=0 fi # $MT_MEGATEST -env2file .ezsteps/${stepname} exit $exitstatus