Menu
▾
▴
[Plplot-cvs] plplot/test test_c.sh.in,1.3,1.4 test_cxx.sh.in,1.3,1.4 test_f77.sh.in,1.8,1.9 test_java.sh.in,1.5,1.6 test_octave.sh.in,1.3,1.4 test_perl.sh.in,1.3,1.4 test_python.sh.in,1.10,1.11 test_tcl.sh.in,1.2,1.3
Update of /cvsroot/plplot/plplot/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6060/test Modified Files: test_c.sh.in test_cxx.sh.in test_f77.sh.in test_java.sh.in test_octave.sh.in test_perl.sh.in test_python.sh.in test_tcl.sh.in Log Message: Update test_???.sh scripts so they properly honour the OUTPUT_DIR variable set in plplot-test.sh. Index: test_c.sh.in =================================================================== RCS file: /cvsroot/plplot/plplot/test/test_c.sh.in,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- test_c.sh.in 27 Apr 2005 06:44:26 -0000 1.3 +++ test_c.sh.in 26 Apr 2006 14:36:02 -0000 1.4 @@ -32,5 +32,5 @@ # skip 21 because it delivers variable results depending on computer timing # and load. for index in 01 02 03 04 05 06 07 08 09 10 11 12 13 15 16 18 19 22 23; do - $cdir/x${index}c -dev $device -o x${index}c.$dsuffix $options + $cdir/x${index}c -dev $device -o ${OUTPUT_DIR}/x${index}c.$dsuffix $options done Index: test_cxx.sh.in =================================================================== RCS file: /cvsroot/plplot/plplot/test/test_cxx.sh.in,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- test_cxx.sh.in 27 Apr 2005 06:44:26 -0000 1.3 +++ test_cxx.sh.in 26 Apr 2006 14:36:02 -0000 1.4 @@ -29,7 +29,7 @@ # x01cc is a C++ alternative that has no corresponding examples for the # other front ends. -$cxxdir/x01cc -dev $device -o x01cc.$dsuffix $options +$cxxdir/x01cc -dev $device -o ${OUTPUT_DIR}/x01cc.$dsuffix $options # Do the standard non-interactive examples. # skip 14 because it requires two output files. @@ -37,5 +37,5 @@ # skip 21 because it delivers variable results depending on computer timing # and load. for index in 01 02 03 04 05 06 07 08 09 10 11 12 13 15 16 18 19 22 23; do - $cxxdir/x${index} -dev $device -o x${index}cxx.$dsuffix $options + $cxxdir/x${index} -dev $device -o ${OUTPUT_DIR}/x${index}cxx.$dsuffix $options done Index: test_tcl.sh.in =================================================================== RCS file: /cvsroot/plplot/plplot/test/test_tcl.sh.in,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- test_tcl.sh.in 27 Apr 2005 06:44:27 -0000 1.2 +++ test_tcl.sh.in 26 Apr 2006 14:36:02 -0000 1.3 @@ -23,6 +23,7 @@ # This is called from plplot-test.sh with $tcldir, $device, $dsuffix, # and $options defined. +cd $OUTPUT_DIR results=`pwd` export results cd $tcldir Index: test_f77.sh.in =================================================================== RCS file: /cvsroot/plplot/plplot/test/test_f77.sh.in,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- test_f77.sh.in 27 Apr 2005 06:44:26 -0000 1.8 +++ test_f77.sh.in 26 Apr 2006 14:36:02 -0000 1.9 @@ -34,7 +34,7 @@ # Do non-standard example 16a because it illustrates plshade functionality # with cmap1 (and also because the result looks nice.) - $f77dir/x16af -dev $device -o x16af.$dsuffix $options + $f77dir/x16af -dev $device -o ${OUTPUT_DIR}/x16af.$dsuffix $options # Do the standard non-interactive examples. # skip 14, 17, and 20 because they are interactive, and 14 and 20 not @@ -43,7 +43,7 @@ # skip 21 because it delivers variable results depending on computer timing # and load (and not implemented yet). for index in 01 02 03 04 05 06 07 08 09 10 11 12 13 15 16 18 22; do - $f77dir/x${index}f -dev $device -o x${index}f.$dsuffix $options + $f77dir/x${index}f -dev $device -o ${OUTPUT_DIR}/x${index}f.$dsuffix $options done else # Fall back to this method if this fortran platform does not have @@ -53,7 +53,7 @@ # with cmap1 (and also because the result looks nice.) $f77dir/x16af <<EOF >/dev/null $device -x16af.$dsuffix +${OUTPUT_DIR}/x16af.$dsuffix EOF # Do the standard non-interactive examples. @@ -65,7 +65,7 @@ for index in 01 02 03 04 05 06 07 08 09 10 11 12 13 15 16 18 22; do $f77dir/x${index}f <<EOF >/dev/null $device -x${index}f.$dsuffix +${OUTPUT_DIR}/x${index}f.$dsuffix EOF done fi Index: test_perl.sh.in =================================================================== RCS file: /cvsroot/plplot/plplot/test/test_perl.sh.in,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- test_perl.sh.in 27 Apr 2005 06:44:26 -0000 1.3 +++ test_perl.sh.in 26 Apr 2006 14:36:02 -0000 1.4 @@ -31,5 +31,5 @@ # skip 21 because it delivers variable results depending on computer timing # and load. for index in 01 02 03 04 05 06 07 08 09 10 11 12 13 15 16 18 19 22; do - $perldir/x${index}.pl -dev $device -o x${index}pdl.$dsuffix $options + $perldir/x${index}.pl -dev $device -o ${OUTPUT_DIR}/x${index}pdl.$dsuffix $options done Index: test_octave.sh.in =================================================================== RCS file: /cvsroot/plplot/plplot/test/test_octave.sh.in,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- test_octave.sh.in 27 Apr 2005 06:44:26 -0000 1.3 +++ test_octave.sh.in 26 Apr 2006 14:36:02 -0000 1.4 @@ -45,7 +45,7 @@ # this. for i=[1:7 8 9 13 15 16]; - figure(i,"$device",sprintf("p%d.$dsuffix",i)); + figure(i,"$device",sprintf("${OUTPUT_DIR}/p%d.$dsuffix",i)); feval(sprintf("p%d",i)) closefig endfor @@ -67,7 +67,7 @@ plSetOpt("dev", device); #o trailer on filename e.g., x01o.ps) to distinguish from other #common examples. - file = sprintf("x%.2do.$dsuffix",i); + file = sprintf("${OUTPUT_DIR}/x%.2do.$dsuffix",i); plSetOpt("o", file); eval(cmd, "failed = [failed, i];"); endfor Index: test_python.sh.in =================================================================== RCS file: /cvsroot/plplot/plplot/test/test_python.sh.in,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- test_python.sh.in 27 Apr 2005 06:44:26 -0000 1.10 +++ test_python.sh.in 26 Apr 2006 14:36:02 -0000 1.11 @@ -26,5 +26,5 @@ # build tree) since must access plplot_python_start.py in build tree and # paths in that file are relative to build tree. for index in 01 02 03 04 05 06 07 08 09 10 11 12 13 15 16 18 22 23; do - @PYTHON@ $pythondir/x$index -dev $device -o x${index}p.$dsuffix $options + @PYTHON@ $pythondir/x$index -dev $device -o ${OUTPUT_DIR}/x${index}p.$dsuffix $options done Index: test_java.sh.in =================================================================== RCS file: /cvsroot/plplot/plplot/test/test_java.sh.in,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- test_java.sh.in 27 Apr 2005 06:44:26 -0000 1.5 +++ test_java.sh.in 26 Apr 2006 14:36:02 -0000 1.6 @@ -45,5 +45,5 @@ fi for index in 01 02 03 04 05 06 07 08 09 10 11 12 13 15 16 18 22 23; do - java -classpath ${javadir}:${PLPLOT_CLASSPATH} ${JAVA_TEST_OPTS} plplot.examples.x${index} -dev $device -o x${index}j.$dsuffix $options + java -classpath ${javadir}:${PLPLOT_CLASSPATH} ${JAVA_TEST_OPTS} plplot.examples.x${index} -dev $device -o ${OUTPUT_DIR}/x${index}j.$dsuffix $options done |