Menu
▾
▴
plplot-cvs
|
From: <ai...@us...> - 2008-12-10 00:38:24
|
Revision: 9061
http://plplot.svn.sourceforge.net/plplot/?rev=9061&view=rev
Author: airwin
Date: 2008-12-10 00:38:18 +0000 (Wed, 10 Dec 2008)
Log Message:
-----------
Initial commit of a script to exercise PLplot interactive devices and scripts.
Added Paths:
-----------
trunk/plplot_test/plplot-test-interactive.sh.in
Added: trunk/plplot_test/plplot-test-interactive.sh.in
===================================================================
--- trunk/plplot_test/plplot-test-interactive.sh.in (rev 0)
+++ trunk/plplot_test/plplot-test-interactive.sh.in 2008-12-10 00:38:18 UTC (rev 9061)
@@ -0,0 +1,44 @@
+#!/bin/sh
+#test suite of all interactive tk stuff that cannot be done by file.
+#tk driver (x14c), tcldemos, tkdemos.
+export cdir=c
+export tcldir=tcl
+export tkdir=tk
+$cdir/x14c -dev tk
+$cdir/x17c -dev tk
+$tkdir/xtk01 -f $tkdir/tk01
+$tkdir/xtk02 -f $tkdir/tk02
+plserver -f $tkdir/tk03
+$tkdir/xtk04 -f $tkdir/tk04
+cd $tcldir
+plserver <<EOF
+plstdwin .
+plxframe .plw
+pack append . .plw {left expand fill}
+source plgrid.tcl
+proc 1 {} "plgrid .plw.plwin"
+1
+exit
+EOF
+cd ../$tkdir
+pwd
+plserver <<EOF
+source tkdemos.tcl
+1
+3
+4
+5
+6
+7
+8
+9
+10
+11
+12
+13
+15
+16
+17
+18
+exit
+EOF
Property changes on: trunk/plplot_test/plplot-test-interactive.sh.in
___________________________________________________________________
Added: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2008-12-10 00:54:00
|
Revision: 9062
http://plplot.svn.sourceforge.net/plplot/?rev=9062&view=rev
Author: airwin
Date: 2008-12-10 00:53:55 +0000 (Wed, 10 Dec 2008)
Log Message:
-----------
Set properties consistent with other configured scripts in directory
Property Changed:
----------------
trunk/plplot_test/plplot-test-interactive.sh.in
Property changes on: trunk/plplot_test/plplot-test-interactive.sh.in
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:keywords
+ Author Date Id Revision
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2008-12-12 06:03:48
|
Revision: 9094
http://plplot.svn.sourceforge.net/plplot/?rev=9094&view=rev
Author: airwin
Date: 2008-12-12 06:03:43 +0000 (Fri, 12 Dec 2008)
Log Message:
-----------
Fill out Tk examples to test, and give reasons why some of the standard 30
are dropped from the list (including dropping example 2 and example 24 to
avoid what appear to be nameclash bugs in this context).
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 2008-12-12 06:00:37 UTC (rev 9093)
+++ trunk/plplot_test/plplot-test-interactive.sh.in 2008-12-12 06:03:43 UTC (rev 9094)
@@ -1,6 +1,6 @@
#!/bin/sh
-#test suite of all interactive tk stuff that cannot be done by file.
-#tk driver (x14c), tcldemos, tkdemos.
+# Test suite of all interactive tk stuff that cannot be done by file.
+# e.g., tk driver (x14c), tcldemos, tkdemos.
export cdir=c
export tcldir=tcl
export tkdir=tk
@@ -22,6 +22,10 @@
EOF
cd ../$tkdir
pwd
+# Drop 2 to avoid 'invalid command name "plhlsrgb"' error.
+# Drop 14 because multiple devices do not seem to work in this context.
+# Drop 17 because it simply prints out unimplemented message.
+# Drop 24 to avoid 'invalid command name "plschr"' error.
plserver <<EOF
source tkdemos.tcl
1
@@ -38,7 +42,17 @@
13
15
16
-17
18
+19
+20
+21
+22
+23
+25
+26
+27
+28
+29
+30
exit
EOF
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2008-12-14 05:58:11
|
Revision: 9099
http://plplot.svn.sourceforge.net/plplot/?rev=9099&view=rev
Author: airwin
Date: 2008-12-14 05:58:09 +0000 (Sun, 14 Dec 2008)
Log Message:
-----------
Install PLD_tk and ENABLE_tk logic to control what interactive tests are done.
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 2008-12-14 05:56:09 UTC (rev 9098)
+++ trunk/plplot_test/plplot-test-interactive.sh.in 2008-12-14 05:58:09 UTC (rev 9099)
@@ -1,17 +1,22 @@
-#!/bin/sh
-# Test suite of all interactive tk stuff that cannot be done by file.
+#!@SH_EXECUTABLE@
+# Test suite of PLplot interactive stuff that cannot be tested with
+# file output device drivers.
# e.g., tk driver (x14c), tcldemos, tkdemos.
export cdir=c
export tcldir=tcl
export tkdir=tk
-$cdir/x14c -dev tk
-$cdir/x17c -dev tk
-$tkdir/xtk01 -f $tkdir/tk01
-$tkdir/xtk02 -f $tkdir/tk02
-plserver -f $tkdir/tk03
-$tkdir/xtk04 -f $tkdir/tk04
-cd $tcldir
-plserver <<EOF
+if [ "@PLD_tk@" = "ON" ] ; then
+ $cdir/x14c -dev tk
+ $cdir/x17c -dev tk
+fi
+
+if [ "@ENABLE_tk@" = "ON" ] ; then
+ $tkdir/xtk01 -f $tkdir/tk01
+ $tkdir/xtk02 -f $tkdir/tk02
+ plserver -f $tkdir/tk03
+ $tkdir/xtk04 -f $tkdir/tk04
+ cd $tcldir
+ plserver <<EOF
plstdwin .
plxframe .plw
pack append . .plw {left expand fill}
@@ -20,13 +25,13 @@
1
exit
EOF
-cd ../$tkdir
-pwd
+ cd ../$tkdir
+ pwd
# Drop 2 to avoid 'invalid command name "plhlsrgb"' error.
# Drop 14 because multiple devices do not seem to work in this context.
# Drop 17 because it simply prints out unimplemented message.
# Drop 24 to avoid 'invalid command name "plschr"' error.
-plserver <<EOF
+ plserver <<EOF
source tkdemos.tcl
1
3
@@ -56,3 +61,4 @@
30
exit
EOF
+fi
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2011-03-20 02:41:19
|
Revision: 11660
http://plplot.svn.sourceforge.net/plplot/?rev=11660&view=rev
Author: airwin
Date: 2011-03-20 02:41:13 +0000 (Sun, 20 Mar 2011)
Log Message:
-----------
Replace phrase "without major errors" so that the string "error" does
not appear in the output of a successful run (which makes it easier to
grep for actual error messages).
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 2011-03-19 23:56:59 UTC (rev 11659)
+++ trunk/plplot_test/plplot-test-interactive.sh.in 2011-03-20 02:41:13 UTC (rev 11660)
@@ -309,6 +309,6 @@
if [ "$OVERALL_STATUS_CODE" -ne 0 ] ; then
echo "A major error occurred for one of the interactive examples"
else
- echo "All interactive tests completed without major errors"
+ echo "All interactive tests completed without any noticeable issues"
fi
exit $OVERALL_STATUS_CODE
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2008-12-14 06:08:44
|
Revision: 9100
http://plplot.svn.sourceforge.net/plplot/?rev=9100&view=rev
Author: airwin
Date: 2008-12-14 06:08:41 +0000 (Sun, 14 Dec 2008)
Log Message:
-----------
Simplify directory logic.
Add both gnome2 and pygcw examples.
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 2008-12-14 05:58:09 UTC (rev 9099)
+++ trunk/plplot_test/plplot-test-interactive.sh.in 2008-12-14 06:08:41 UTC (rev 9100)
@@ -2,20 +2,32 @@
# Test suite of PLplot interactive stuff that cannot be tested with
# file output device drivers.
# e.g., tk driver (x14c), tcldemos, tkdemos.
-export cdir=c
-export tcldir=tcl
-export tkdir=tk
+
+if [ "@ENABLE_gnome2@" = "ON" ] ; then
+ cd c
+ ./plplotcanvas_demo
+ ./plplotcanvas_animation
+ cd ..
+fi
+
+if [ "@ENABLE_pygcw@" = "ON" ] ; then
+ cd python
+ ./plplotcanvas_demo.py
+ ./plplotcanvas_animation.py
+ cd ..
+fi
+
if [ "@PLD_tk@" = "ON" ] ; then
- $cdir/x14c -dev tk
- $cdir/x17c -dev tk
+ c/x14c -dev tk
+ c/x17c -dev tk
fi
if [ "@ENABLE_tk@" = "ON" ] ; then
- $tkdir/xtk01 -f $tkdir/tk01
- $tkdir/xtk02 -f $tkdir/tk02
- plserver -f $tkdir/tk03
- $tkdir/xtk04 -f $tkdir/tk04
- cd $tcldir
+ tk/xtk01 -f tk/tk01
+ tk/xtk02 -f tk/tk02
+ plserver -f tk/tk03
+ tk/xtk04 -f tk/tk04
+ cd tcl
plserver <<EOF
plstdwin .
plxframe .plw
@@ -25,7 +37,7 @@
1
exit
EOF
- cd ../$tkdir
+ cd ../tk
pwd
# Drop 2 to avoid 'invalid command name "plhlsrgb"' error.
# Drop 14 because multiple devices do not seem to work in this context.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2008-12-14 08:50:23
|
Revision: 9102
http://plplot.svn.sourceforge.net/plplot/?rev=9102&view=rev
Author: airwin
Date: 2008-12-14 08:50:21 +0000 (Sun, 14 Dec 2008)
Log Message:
-----------
Add some more interactive examples.
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 2008-12-14 07:58:15 UTC (rev 9101)
+++ trunk/plplot_test/plplot-test-interactive.sh.in 2008-12-14 08:50:21 UTC (rev 9102)
@@ -1,8 +1,42 @@
#!@SH_EXECUTABLE@
# Test suite of PLplot interactive stuff that cannot be tested with
# file output device drivers.
-# e.g., tk driver (x14c), tcldemos, tkdemos.
+
+if [ "@PLD_xwin@" = "ON" ] ; then
+ c/x01c -dev xwin
+ c/x04c -dev xwin
+ c/x08c -dev xwin
+ c/x16c -dev xwin
+fi
+
+if [ "@PLD_gcw@" = "ON" ] ; then
+ c/x01c -dev gcw
+ c/x04c -dev gcw
+ c/x08c -dev gcw
+ c/x16c -dev gcw
+fi
+
+if [ "@PLD_wxwidgets@" = "ON" ] ; then
+ c/x01c -dev wxwidgets
+ c/x04c -dev wxwidgets
+ c/x08c -dev wxwidgets
+ c/x16c -dev wxwidgets
+fi
+
+if [ "@PLD_xcairo@" = "ON" ] ; then
+ c/x01c -dev xcairo
+ c/x04c -dev xcairo
+ c/x08c -dev xcairo
+ c/x16c -dev xcairo
+fi
+
+if [ "@ENABLE_wxwidgets@" = "ON" ] ; then
+ cd c++
+ ./wxPLplotDemo
+ cd ..
+fi
+
if [ "@ENABLE_gnome2@" = "ON" ] ; then
cd c
./plplotcanvas_demo
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2009-01-17 20:23:35
|
Revision: 9331
http://plplot.svn.sourceforge.net/plplot/?rev=9331&view=rev
Author: airwin
Date: 2009-01-17 20:23:25 +0000 (Sat, 17 Jan 2009)
Log Message:
-----------
Massively update interactive testing script with cleaned-up logic and much
improved error reporting.
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 2009-01-17 13:26:36 UTC (rev 9330)
+++ trunk/plplot_test/plplot-test-interactive.sh.in 2009-01-17 20:23:25 UTC (rev 9331)
@@ -2,65 +2,121 @@
# Test suite of PLplot interactive stuff that cannot be tested with
# file output device drivers.
-
+INDEX_LIST="01 04 08 14 16 17 23"
+DEVICE_LIST=
if [ "@PLD_xwin@" = "ON" ] ; then
- c/x01c -dev xwin
- c/x04c -dev xwin
- c/x08c -dev xwin
- c/x16c -dev xwin
+ DEVICE_LIST="$DEVICE_LIST xwin"
fi
+if [ "@PLD_tk@" = "ON" ] ; then
+ DEVICE_LIST="$DEVICE_LIST tk"
+fi
+
+if [ "@PLD_xcairo@" = "ON" ] ; then
+ DEVICE_LIST="$DEVICE_LIST xcairo"
+fi
+
if [ "@PLD_gcw@" = "ON" ] ; then
- c/x01c -dev gcw
- c/x04c -dev gcw
- c/x08c -dev gcw
- c/x16c -dev gcw
+ DEVICE_LIST="$DEVICE_LIST gcw"
fi
if [ "@PLD_wxwidgets@" = "ON" ] ; then
- c/x01c -dev wxwidgets
- c/x04c -dev wxwidgets
- c/x08c -dev wxwidgets
- c/x16c -dev wxwidgets
+ DEVICE_LIST="$DEVICE_LIST wxwidgets"
fi
-if [ "@PLD_xcairo@" = "ON" ] ; then
- c/x01c -dev xcairo
- c/x04c -dev xcairo
- c/x08c -dev xcairo
- c/x16c -dev xcairo
-fi
+for device in $DEVICE_LIST ; do
+ for index in $INDEX_LIST ; do
+ echo "c/x${index}c -dev $device"
+ 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 for c/x${index}c -dev $device"
+ 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"
+ fi
+ done
+done
+INDEX_LIST=
+COUNT=0
if [ "@ENABLE_wxwidgets@" = "ON" ] ; then
- cd c++
- ./wxPLplotDemo
- cd ..
+ INDEX_LIST="$INDEX_LIST $COUNT"
+ DIRECTORY[$COUNT]="c++"
+ COMMAND[$COUNT]="./wxPLplotDemo"
+ COUNT=$(( $COUNT + 1 ))
fi
if [ "@ENABLE_gnome2@" = "ON" ] ; then
- cd c
- ./plplotcanvas_demo
- ./plplotcanvas_animation
- cd ..
+ INDEX_LIST="$INDEX_LIST $COUNT"
+ DIRECTORY[$COUNT]="c"
+ COMMAND[$COUNT]="./plplotcanvas_demo"
+ COUNT=$(( $COUNT + 1 ))
+
+ INDEX_LIST="$INDEX_LIST $COUNT"
+ DIRECTORY[$COUNT]="c"
+ COMMAND[$COUNT]="./plplotcanvas_animation"
+ COUNT=$(( $COUNT + 1 ))
fi
if [ "@ENABLE_pygcw@" = "ON" ] ; then
- cd python
- ./plplotcanvas_demo.py
- ./plplotcanvas_animation.py
- cd ..
+ INDEX_LIST="$INDEX_LIST $COUNT"
+ DIRECTORY[$COUNT]="python"
+ COMMAND[$COUNT]="./plplotcanvas_demo.py"
+ COUNT=$(( $COUNT + 1 ))
+
+ INDEX_LIST="$INDEX_LIST $COUNT"
+ DIRECTORY[$COUNT]="python"
+ COMMAND[$COUNT]="./plplotcanvas_animation.py"
+ COUNT=$(( $COUNT + 1 ))
fi
-if [ "@PLD_tk@" = "ON" ] ; then
- c/x14c -dev tk
- c/x17c -dev tk
+if [ "@ENABLE_tk@" = "ON" ] ; then
+ INDEX_LIST="$INDEX_LIST $COUNT"
+ DIRECTORY[$COUNT]="tk"
+ COMMAND[$COUNT]="./xtk01 -f tk01"
+ COUNT=$(( $COUNT + 1 ))
+
+ INDEX_LIST="$INDEX_LIST $COUNT"
+ DIRECTORY[$COUNT]="tk"
+ COMMAND[$COUNT]="./xtk02 -f tk02"
+ COUNT=$(( $COUNT + 1 ))
+
+ INDEX_LIST="$INDEX_LIST $COUNT"
+ DIRECTORY[$COUNT]="tk"
+ COMMAND[$COUNT]="plserver -f tk03"
+ COUNT=$(( $COUNT + 1 ))
+
+ INDEX_LIST="$INDEX_LIST $COUNT"
+ DIRECTORY[$COUNT]="tk"
+ COMMAND[$COUNT]="./xtk04 -f tk04"
+ COUNT=$(( $COUNT + 1 ))
fi
+# execute all interactive commands set up by previous stanzas.
+for index in $INDEX_LIST ; do
+ pushd ${DIRECTORY[$index]}
+ echo "${COMMAND[$index]}"
+ ${COMMAND[$index]} 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 for ${COMMAND[$index]}"
+ 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 ${COMMAND[$index]}"
+ fi
+ popd
+done
+
if [ "@ENABLE_tk@" = "ON" ] ; then
- tk/xtk01 -f tk/tk01
- tk/xtk02 -f tk/tk02
- plserver -f tk/tk03
- tk/xtk04 -f tk/tk04
cd tcl
plserver <<EOF
plstdwin .
@@ -75,8 +131,8 @@
pwd
# Drop 2 to avoid 'invalid command name "plhlsrgb"' error.
# Drop 14 because multiple devices do not seem to work in this context.
-# Drop 17 because it simply prints out unimplemented message.
# Drop 24 to avoid 'invalid command name "plschr"' error.
+# Drop 31 since it produces empty plot (by design).
plserver <<EOF
source tkdemos.tcl
1
@@ -93,6 +149,7 @@
13
15
16
+17
18
19
20
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2009-01-17 22:48:51
|
Revision: 9333
http://plplot.svn.sourceforge.net/plplot/?rev=9333&view=rev
Author: airwin
Date: 2009-01-17 21:34:26 +0000 (Sat, 17 Jan 2009)
Log Message:
-----------
Three improvements to error reporting.
(1) Include non-zero status codes in ERROR message.
(2) Report overall status code (i.e., whether any major errors occurred for
any of the examples) at end of script.
(3) Return overall status code at end of script.
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 2009-01-17 21:28:44 UTC (rev 9332)
+++ trunk/plplot_test/plplot-test-interactive.sh.in 2009-01-17 21:34:26 UTC (rev 9333)
@@ -2,6 +2,7 @@
# Test suite of PLplot interactive stuff that cannot be tested with
# file output device drivers.
+OVERALL_STATUS_CODE=0
INDEX_LIST="01 04 08 14 16 17 23"
DEVICE_LIST=
if [ "@PLD_xwin@" = "ON" ] ; then
@@ -31,13 +32,15 @@
# 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 for c/x${index}c -dev $device"
+ 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
done
@@ -105,13 +108,15 @@
# 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 for ${COMMAND[$index]}"
+ echo "ERROR indicated by status code = $status_code for ${COMMAND[$index]}"
+ 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 ${COMMAND[$index]}"
+ OVERALL_STATUS_CODE=1
fi
popd
done
@@ -165,3 +170,9 @@
exit
EOF
fi
+if [ "$OVERALL_STATUS_CODE" -ne 0 ] ; then
+ echo "A major error occurred for one of the interactive examples"
+else
+ echo "All interactive tests completed without major errors"
+fi
+exit $OVERALL_STATUS_CODE
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2009-04-24 18:18:39
|
Revision: 9846
http://plplot.svn.sourceforge.net/plplot/?rev=9846&view=rev
Author: airwin
Date: 2009-04-24 18:18:29 +0000 (Fri, 24 Apr 2009)
Log Message:
-----------
Add -dev qtwidget to interactive suite of tests.
Add qt_example application which demonstrates extqt to interactive suite of
tests.
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 2009-04-24 18:00:38 UTC (rev 9845)
+++ trunk/plplot_test/plplot-test-interactive.sh.in 2009-04-24 18:18:29 UTC (rev 9846)
@@ -25,6 +25,10 @@
DEVICE_LIST="$DEVICE_LIST wxwidgets"
fi
+if [ "@PLD_qtwidget@" = "ON" ] ; then
+ DEVICE_LIST="$DEVICE_LIST qtwidget"
+fi
+
for device in $DEVICE_LIST ; do
for index in $INDEX_LIST ; do
echo "c/x${index}c -dev $device"
@@ -68,6 +72,13 @@
COUNT=$(( $COUNT + 1 ))
fi
+if [ "@PLD_extqt@" = "ON" ] ; then
+ INDEX_LIST="$INDEX_LIST $COUNT"
+ DIRECTORY[$COUNT]="c++"
+ COMMAND[$COUNT]="./qt_example"
+ COUNT=$(( $COUNT + 1 ))
+fi
+
if [ "@ENABLE_gnome2@" = "ON" ] ; then
INDEX_LIST="$INDEX_LIST $COUNT"
DIRECTORY[$COUNT]="c"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2009-06-02 23:17:36
|
Revision: 10026
http://plplot.svn.sourceforge.net/plplot/?rev=10026&view=rev
Author: airwin
Date: 2009-06-02 23:17:32 +0000 (Tue, 02 Jun 2009)
Log Message:
-----------
Add SRC_EXAMPLES_DIR and EXAMPLES_DIR awareness to the script so that it can
be run in a separate build tree for the new CMake-based build system for the
installed examples.
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 2009-06-01 19:53:51 UTC (rev 10025)
+++ trunk/plplot_test/plplot-test-interactive.sh.in 2009-06-02 23:17:32 UTC (rev 10026)
@@ -1,7 +1,21 @@
#!@SH_EXECUTABLE@
# Test suite of PLplot interactive stuff that cannot be tested with
# file output device drivers.
+EXAMPLES_DIR=${EXAMPLES_DIR:-.}
+SRC_EXAMPLES_DIR=${SRC_EXAMPLES_DIR:-.}
+# This script is only designed to work when EXAMPLES_DIR is a directory
+# with a subdirectory called "c". Check whether this conditions is true.
+
+if [ ! -d $EXAMPLES_DIR/c ] ; then
+echo '
+This script is only designed to work when the EXAMPLES_DIR environment
+variable (overridden by option --examples-dir) is a directory with a
+subdirectory called "c". This condition has been violated.
+'
+exit 1
+fi
+
OVERALL_STATUS_CODE=0
INDEX_LIST="01 04 08 14 16 17 23"
DEVICE_LIST=
@@ -31,8 +45,8 @@
for device in $DEVICE_LIST ; do
for index in $INDEX_LIST ; do
- echo "c/x${index}c -dev $device"
- c/x${index}c -dev $device 2> test.error
+ 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
@@ -53,80 +67,80 @@
COUNT=0
if [ "@PLD_xcairo@" = "ON" ] ; then
INDEX_LIST="$INDEX_LIST $COUNT"
- DIRECTORY[$COUNT]="c"
+ DIRECTORY[$COUNT]="${EXAMPLES_DIR}/c"
COMMAND[$COUNT]="./extXdrawable_demo"
COUNT=$(( $COUNT + 1 ))
fi
if [ "@PLD_extcairo@" = "ON" ] ; then
INDEX_LIST="$INDEX_LIST $COUNT"
- DIRECTORY[$COUNT]="c"
+ DIRECTORY[$COUNT]="${EXAMPLES_DIR}/c"
COMMAND[$COUNT]="./ext-cairo-test"
COUNT=$(( $COUNT + 1 ))
fi
if [ "@ENABLE_wxwidgets@" = "ON" ] ; then
INDEX_LIST="$INDEX_LIST $COUNT"
- DIRECTORY[$COUNT]="c++"
+ DIRECTORY[$COUNT]="${EXAMPLES_DIR}/c++"
COMMAND[$COUNT]="./wxPLplotDemo"
COUNT=$(( $COUNT + 1 ))
fi
if [ "@PLD_extqt@" = "ON" ] ; then
INDEX_LIST="$INDEX_LIST $COUNT"
- DIRECTORY[$COUNT]="c++"
+ DIRECTORY[$COUNT]="${EXAMPLES_DIR}/c++"
COMMAND[$COUNT]="./qt_example"
COUNT=$(( $COUNT + 1 ))
fi
if [ "@ENABLE_gnome2@" = "ON" ] ; then
INDEX_LIST="$INDEX_LIST $COUNT"
- DIRECTORY[$COUNT]="c"
+ DIRECTORY[$COUNT]="${EXAMPLES_DIR}/c"
COMMAND[$COUNT]="./plplotcanvas_demo"
COUNT=$(( $COUNT + 1 ))
INDEX_LIST="$INDEX_LIST $COUNT"
- DIRECTORY[$COUNT]="c"
+ DIRECTORY[$COUNT]="${EXAMPLES_DIR}/c"
COMMAND[$COUNT]="./plplotcanvas_animation"
COUNT=$(( $COUNT + 1 ))
fi
if [ "@ENABLE_pygcw@" = "ON" ] ; then
INDEX_LIST="$INDEX_LIST $COUNT"
- DIRECTORY[$COUNT]="python"
+ DIRECTORY[$COUNT]="${SRC_EXAMPLES_DIR}/python"
COMMAND[$COUNT]="./plplotcanvas_demo.py"
COUNT=$(( $COUNT + 1 ))
INDEX_LIST="$INDEX_LIST $COUNT"
- DIRECTORY[$COUNT]="python"
+ DIRECTORY[$COUNT]="${SRC_EXAMPLES_DIR}/python"
COMMAND[$COUNT]="./plplotcanvas_animation.py"
COUNT=$(( $COUNT + 1 ))
fi
if [ "@ENABLE_tk@" = "ON" ] ; then
INDEX_LIST="$INDEX_LIST $COUNT"
- DIRECTORY[$COUNT]="tk"
+ DIRECTORY[$COUNT]="${EXAMPLES_DIR}/tk"
COMMAND[$COUNT]="./xtk01 -f tk01"
COUNT=$(( $COUNT + 1 ))
fi
if [ "@ENABLE_itk@" = "ON" ] ; then
INDEX_LIST="$INDEX_LIST $COUNT"
- DIRECTORY[$COUNT]="tk"
+ DIRECTORY[$COUNT]="${EXAMPLES_DIR}/tk"
COMMAND[$COUNT]="./xtk02 -f tk02"
COUNT=$(( $COUNT + 1 ))
fi
if [ "@ENABLE_tk@" = "ON" ] ; then
INDEX_LIST="$INDEX_LIST $COUNT"
- DIRECTORY[$COUNT]="tk"
+ DIRECTORY[$COUNT]="${EXAMPLES_DIR}/tk"
COMMAND[$COUNT]="plserver -f tk03"
COUNT=$(( $COUNT + 1 ))
fi
if [ "@ENABLE_itk@" = "ON" ] ; then
INDEX_LIST="$INDEX_LIST $COUNT"
- DIRECTORY[$COUNT]="tk"
+ DIRECTORY[$COUNT]="${EXAMPLES_DIR}/tk"
COMMAND[$COUNT]="./xtk04 -f tk04"
COUNT=$(( $COUNT + 1 ))
fi
@@ -153,7 +167,7 @@
done
if [ "@ENABLE_tk@" = "ON" ] ; then
- cd tcl
+ cd ${SRC_EXAMPLES_DIR}/tcl
plserver <<EOF
plstdwin .
plxframe .plw
@@ -163,7 +177,7 @@
1
exit
EOF
- cd ../tk
+ 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).
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2009-07-08 19:07:21
|
Revision: 10123
http://plplot.svn.sourceforge.net/plplot/?rev=10123&view=rev
Author: airwin
Date: 2009-07-08 19:07:11 +0000 (Wed, 08 Jul 2009)
Log Message:
-----------
Implementation of user options for this script. Currently, just the
list of which interactive devices will be used for the standard examples
tests is implemented with a --device option, but more user options are
planned to control what tests are run for the non-standard interactive
examples.
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 2009-07-08 19:01:05 UTC (rev 10122)
+++ trunk/plplot_test/plplot-test-interactive.sh.in 2009-07-08 19:07:11 UTC (rev 10123)
@@ -1,49 +1,154 @@
#!@SH_EXECUTABLE@
+# -*- mode: shell-script -*-
+# $Id$
+#
+# Copyright (C) 2009 Alan W. Irwin
+#
+# This file is part of PLplot.
+#
+# PLplot is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Library Public License as published
+# by the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# PLplot is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Library General Public License for more details.
+#
+# You should have received a copy of the GNU Library General Public License
+# along with PLplot; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
# Test suite of PLplot interactive stuff that cannot be tested with
# file output device drivers.
+
EXAMPLES_DIR=${EXAMPLES_DIR:-.}
SRC_EXAMPLES_DIR=${SRC_EXAMPLES_DIR:-.}
+usage()
+{
+echo '
+Usage: plplot-test-interactive.sh [OPTIONS]
+
+Options:
+ [--device=DEVICES_LIST]
+ where DEVICES_LIST is one of more devices specified as a
+ blank-delimited string (e.g., --device=xwin or
+ --device="qtwidget extqt"). Note each specified device must be
+ taken from the following list of eligible interactive devices:
+
+ xwin, tk, xcairo, gcw, wxwidgets, qtwidget, extcairo or extqt.
+
+ [--help]
+
+Environment variables:
+ DEVICES_LIST can be used to specify the device(s).
+ This environment variable is overridden by the option --device.
+
+N.B. All members of DEVICES_LIST (whether specified by the
+DEVICES_LIST environment variable or by the --device option _must_ be
+configured. If neither the environment variable or --device option is
+specified, then every _configured_ device from the above list is used.
+'
+ exit $1
+}
+
+# Figure out what script options were specified by the user.
+
+while test $# -gt 0; do
+ if [ "@HAVE_BASH@" = "ON" ] ; then
+ case "$1" in
+ -*=*) optarg=${1#*=} ;;
+ *) optarg= ;;
+ esac
+ else
+ case "$1" in
+ -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
+ *) optarg= ;;
+ esac
+ fi
+
+ case $1 in
+ --device=*)
+ DEVICES_LIST=$optarg
+ ;;
+ --help)
+ usage 0 1>&2
+ ;;
+ *)
+ usage 1 1>&2
+ ;;
+ esac
+ shift
+done
+
# This script is only designed to work when EXAMPLES_DIR is a directory
# with a subdirectory called "c". Check whether this conditions is true.
-
if [ ! -d $EXAMPLES_DIR/c ] ; then
-echo '
+ echo '
This script is only designed to work when the EXAMPLES_DIR environment
variable (overridden by option --examples-dir) is a directory with a
subdirectory called "c". This condition has been violated.
'
-exit 1
+ exit 1
fi
-OVERALL_STATUS_CODE=0
-INDEX_LIST="01 04 08 14 16 17 23"
-DEVICE_LIST=
-if [ "@PLD_xwin@" = "ON" ] ; then
- DEVICE_LIST="$DEVICE_LIST xwin"
-fi
+# Set up interactive and/or external devices that are used for tests.
+# Cannot use loop for this because of configuration.
-if [ "@PLD_tk@" = "ON" ] ; then
- DEVICE_LIST="$DEVICE_LIST tk"
-fi
+PLD_xwin=@PLD_xwin@
+PLD_tk=@PLD_tk@
+PLD_xcairo=@PLD_xcairo@
+PLD_gcw=@PLD_gcw@
+PLD_wxwidgets=@PLD_wxwidgets@
+PLD_qtwidget=@PLD_qtwidget@
+PLD_extcairo=@PLD_extcairo@
+PLD_extqt=@PLD_extqt@
-if [ "@PLD_xcairo@" = "ON" ] ; then
- DEVICE_LIST="$DEVICE_LIST xcairo"
-fi
+# These blank-delimited strings must be consistent with previous configured
+# list of devices.
+POSSIBLE_INTERACTIVE_DEVICES_LIST="xwin tk xcairo gcw wxwidgets qtwidget"
+POSSIBLE_DEVICES_LIST="$POSSIBLE_INTERACTIVE_DEVICES_LIST extcairo extqt"
-if [ "@PLD_gcw@" = "ON" ] ; then
- DEVICE_LIST="$DEVICE_LIST gcw"
+# Default DEVICES_LIST is all eligible devices if environment variable
+# not specified and --devices option not specified.
+if [ -z "$DEVICES_LIST" ] ; then
+ DEVICES_LIST=
+ for device in $POSSIBLE_DEVICES_LIST ; do
+ eval pld_device='$'PLD_$device
+ test "$pld_device" = "ON" && DEVICES_LIST="$DEVICES_LIST $device"
+ done
fi
-if [ "@PLD_wxwidgets@" = "ON" ] ; then
- DEVICE_LIST="$DEVICE_LIST wxwidgets"
-fi
+# Check that everything in DEVICES_LIST is a configured device.
+for device in $DEVICES_LIST ; do
+ eval pld_device='$'PLD_$device
+ if [ ! "$pld_device" = "ON" ] ; then
+ echo "$device is either not configured or not used for interactive tests."
+ usage 1 1>&2
+ fi
+done
-if [ "@PLD_qtwidget@" = "ON" ] ; then
- DEVICE_LIST="$DEVICE_LIST qtwidget"
-fi
+# Turn off all devices not mentioned in DEVICES_LIST.
+for device in $POSSIBLE_DEVICES_LIST ; do
+ eval "PLD_$device=OFF"
+done
-for device in $DEVICE_LIST ; do
+for device in $DEVICES_LIST ; do
+ eval "PLD_$device=ON"
+done
+
+INTERACTIVE_DEVICES_LIST=
+for device in $POSSIBLE_INTERACTIVE_DEVICES_LIST ; do
+ eval pld_device='$'PLD_$device
+ test "$pld_device" = "ON" && \
+ INTERACTIVE_DEVICES_LIST="$INTERACTIVE_DEVICES_LIST $device"
+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
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
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.
|
|
From: <ai...@us...> - 2011-11-25 01:23:18
|
Revision: 12044
http://plplot.svn.sourceforge.net/plplot/?rev=12044&view=rev
Author: airwin
Date: 2011-11-25 01:23:11 +0000 (Fri, 25 Nov 2011)
Log Message:
-----------
Fix bug where an attempt to run special interactive C++ examples could
happen when C++ was not configured.
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 2011-11-25 01:20:57 UTC (rev 12043)
+++ trunk/plplot_test/plplot-test-interactive.sh.in 2011-11-25 01:23:11 UTC (rev 12044)
@@ -168,14 +168,14 @@
COUNT=$(( $COUNT + 1 ))
fi
-if [ "@ENABLE_wxwidgets@" = "ON" ] ; then
+if [ "@ENABLE_wxwidgets@" = "ON" -a "@ENABLE_cxx@" = "ON" ] ; then
INDEX_LIST="$INDEX_LIST $COUNT"
DIRECTORY[$COUNT]="${EXAMPLES_DIR}/c++"
COMMAND[$COUNT]="./wxPLplotDemo"
COUNT=$(( $COUNT + 1 ))
fi
-if [ "@PLD_extqt@" = "ON" ] ; then
+if [ "@PLD_extqt@" = "ON" -a "@ENABLE_cxx@" = "ON" ] ; then
INDEX_LIST="$INDEX_LIST $COUNT"
DIRECTORY[$COUNT]="${EXAMPLES_DIR}/c++"
COMMAND[$COUNT]="./qt_example"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2014-04-21 00:06:16
|
Revision: 13102
http://sourceforge.net/p/plplot/code/13102
Author: airwin
Date: 2014-04-21 00:06:13 +0000 (Mon, 21 Apr 2014)
Log Message:
-----------
Refine the condition where qt_example is allowed to be tested by the
traditional build system for the installed examples.
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 2014-04-20 23:58:47 UTC (rev 13101)
+++ trunk/plplot_test/plplot-test-interactive.sh.in 2014-04-21 00:06:13 UTC (rev 13102)
@@ -177,7 +177,7 @@
COUNT=$(( $COUNT + 1 ))
fi
-if [ "@PLD_extqt@" = "ON" -a "@ENABLE_cxx@" = "ON" ] ; then
+if [ "@PLD_extqt@" = "ON" -a "@ENABLE_cxx@" = "ON" -a "@qt_gui_true@" != "#" ] ; then
INDEX_LIST="$INDEX_LIST $COUNT"
DIRECTORY[$COUNT]="${EXAMPLES_DIR}/c++"
COMMAND[$COUNT]="./qt_example"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Thanks for helping keep SourceForge clean.
X