From: <ai...@us...> - 2010-08-20 18:28:47
|
Revision: 11143 http://plplot.svn.sourceforge.net/plplot/?rev=11143&view=rev Author: airwin Date: 2010-08-20 18:28:41 +0000 (Fri, 20 Aug 2010) Log Message: ----------- Fix cd bug for relative path case. Run plplot-test.sh in interactive mode rather than using an independent implementation of the same idea. Modified Paths: -------------- trunk/plplot_test/plplot-test-interactive.sh.in Modified: trunk/plplot_test/plplot-test-interactive.sh.in =================================================================== --- trunk/plplot_test/plplot-test-interactive.sh.in 2010-08-20 18:25:26 UTC (rev 11142) +++ trunk/plplot_test/plplot-test-interactive.sh.in 2010-08-20 18:28:41 UTC (rev 11143) @@ -147,25 +147,9 @@ done OVERALL_STATUS_CODE=0 -INDEX_LIST="01 04 08 14 16 17 23" for device in $INTERACTIVE_DEVICES_LIST ; do - for index in $INDEX_LIST ; do - echo "${EXAMPLES_DIR}/c/x${index}c -dev $device" - "${EXAMPLES_DIR}"/c/x${index}c -dev $device 2> test.error - # Look for any status codes (segfaults, plexit) from the examples themselves - status_code=$? - if [ "$status_code" -ne 0 ] ; then - echo "ERROR indicated by status code = $status_code for c/x${index}c -dev $device" - OVERALL_STATUS_CODE=$status_code - fi - cat test.error - # Look for any PLPLOT ERROR messages from plwarn that do not result in an exit code. - is_error=`grep -l 'PLPLOT ERROR' test.error` - if [ -n "$is_error" ] ; then - echo "ERROR indicated by 'PLPLOT ERROR' in stderr for c/x${index}c -dev $device" - OVERALL_STATUS_CODE=1 - fi - done + ./plplot-test.sh --verbose --interactive --device=$device + OVERALL_STATUS_CODE=$? done INDEX_LIST= @@ -282,8 +266,10 @@ 1 exit EOF + +# Just in case EXAMPLES_DIR is a relative path such as the default ".". + cd .. cd "${EXAMPLES_DIR}"/tk - pwd # Drop 14 because multiple devices do not seem to work in this context. # Drop 31 since it produces empty plot (by design). plserver <<EOF This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |