diff --git a/changelog b/changelog index 4d7f421..7d3f2df 100644 --- a/changelog +++ b/changelog @@ -1,3 +1,6 @@ +20070907 tpd src/algebra/acplot.spad fix PlaneAlgebraicCurvePlot.help NOISE +20070907 tpd src/algebra/Makefile make regression respect NOISE variable +20070907 tpd src/input/Makefile make regression respect NOISE variable 20070906 tpd Makefile int/sman/axiom command to target command for install 20070906 tpd src/sman/Makefile copy axiom command to int 20070906 tpd merge help files branch diff --git a/src/algebra/Makefile.pamphlet b/src/algebra/Makefile.pamphlet index ba8b53f..445aac8 100644 --- a/src/algebra/Makefile.pamphlet +++ b/src/algebra/Makefile.pamphlet @@ -2057,10 +2057,23 @@ single stanza: \begin{verbatim} %.regress: %.input @ echo algebra regression testing $* - @ rm -f $*.output - @ echo ')read $*.input' | ${TESTSYS} - @ echo ')lisp (regress "$*.output")' | ${TESTSYS} \ - | egrep -v '(Timestamp|Version)' | tee $*.regress + @ (cd ${MID} ; \ + rm -f $*.output ; \ + if [ -z "${NOISE}" ] ; then \ + echo ')read $*.input' | ${TESTSYS} ; \ + else \ + echo ')read $*.input' | ${TESTSYS} >${TMP}/trace ; \ + fi ; \ + rm $*.input ; \ + if [ -z "${NOISE}" ] ; then \ + echo ')lisp (regress "$*.output")' | ${TESTSYS} \ + | egrep -v '(Timestamp|Version)' | tee $*.regress ; \ + else \ + echo ')lisp (regress "$*.output")' | ${TESTSYS} \ + | egrep -v '(Timestamp|Version)' > $*.regress ; \ + fi ; \ + fgrep "regression result" $*.regress ) + \end{verbatim} The input Makefile extracts {\bf algebra.regress} and then calls make to process this file. @@ -2191,10 +2204,21 @@ REGRESS=\ %.regress: %.input @ echo algebra regression testing $* - @ rm -f $*.output - @ echo ')read $*.input' | ${TESTSYS} - @ echo ')lisp (regress "$*.output")' | ${TESTSYS} \ - | egrep -v '(Timestamp|Version)' | tee $*.regress + @ rm -f $*.output + @ if [ -z "${NOISE}" ] ; then \ + echo ')read $*.input' | ${TESTSYS} ; \ + else \ + echo ')read $*.input' | ${TESTSYS} >${TMP}/trace ; \ + fi + @ rm $*.input + @ if [ -z "${NOISE}" ] ; then \ + echo ')lisp (regress "$*.output")' | ${TESTSYS} \ + | egrep -v '(Timestamp|Version)' | tee $*.regress ; \ + else \ + echo ')lisp (regress "$*.output")' | ${TESTSYS} \ + | egrep -v '(Timestamp|Version)' > $*.regress ; \ + fi + @ fgrep "regression result" $*.regress all: ${REGRESS} @echo algebra test cases complete. diff --git a/src/algebra/acplot.spad.pamphlet b/src/algebra/acplot.spad.pamphlet index b43e587..8a1ad4a 100644 --- a/src/algebra/acplot.spad.pamphlet +++ b/src/algebra/acplot.spad.pamphlet @@ -218,6 +218,10 @@ RealSolvePackage(): _ \section{domain ACPLOT PlaneAlgebraicCurvePlot} <>= -- acplot.spad.pamphlet PlaneAlgebraicCurvePlot.input +)spool PlaneAlgebraicCurvePlot.output +)set message test on +)set message auto off +)clear all --S 1 of 1 makeSketch(x+y,x,y,-1/2..1/2,-1/2..1/2)$ACPLOT --R (1) ACPLOT @@ -228,6 +232,8 @@ makeSketch(x+y,x,y,-1/2..1/2,-1/2..1/2)$ACPLOT --R [-0.5,0.5] --R Type: PlaneAlgebraicCurvePlot --E 1 +)spool +)lisp (bye) @ <>= ==================================================================== diff --git a/src/input/Makefile.pamphlet b/src/input/Makefile.pamphlet index 38b647a..2123928 100644 --- a/src/input/Makefile.pamphlet +++ b/src/input/Makefile.pamphlet @@ -383,8 +383,13 @@ identical output. @ echo ')set message auto off' >> tmp.input @ echo ')read $*' >> tmp.input @ echo ')lisp (bye)' >> tmp.input - @ echo 'systemCommand "read tmp.input"' | ${TESTSYS} \ - | egrep -v '(Timestamp|Version)' | tee $*.output + @ if [ -z "${NOISE}" ] ; then \ + echo 'systemCommand "read tmp.input"' | ${TESTSYS} \ + | egrep -v '(Timestamp|Version)' | tee $*.output ; \ + else \ + echo 'systemCommand "read tmp.input"' | ${TESTSYS} \ + | egrep -v '(Timestamp|Version)' > $*.output ; \ + fi @ rm tmp.input @ @@ -402,14 +407,22 @@ the built-in gclweb function (see src/interp/gclweb.lisp) <>= %.regress: %.input @ echo regression testing $* - @ rm -f $*.output - @ cp ${IN}/$*.input.pamphlet ${MID} - @ echo ')read $*.input' | ${TESTSYS} - @ rm ${MID}/$*.input.pamphlet - @ rm $*.input - @ echo ')lisp (regress "$*.output")' | ${TESTSYS} \ - | egrep -v '(Timestamp|Version)' | tee $*.regress - + @ (cd ${MID} ; \ + rm -f $*.output ; \ + if [ -z "${NOISE}" ] ; then \ + echo ')read $*.input' | ${TESTSYS} ; \ + else \ + echo ')read $*.input' | ${TESTSYS} >${TMP}/trace ; \ + fi ; \ + rm $*.input ; \ + if [ -z "${NOISE}" ] ; then \ + echo ')lisp (regress "$*.output")' | ${TESTSYS} \ + | egrep -v '(Timestamp|Version)' | tee $*.regress ; \ + else \ + echo ')lisp (regress "$*.output")' | ${TESTSYS} \ + | egrep -v '(Timestamp|Version)' > $*.regress ; \ + fi ; \ + fgrep "regression result" $*.regress ) @ \section{The Makefile}