[Plplot-cvs] SF.net SVN: plplot:[11392] trunk/plplot_test

[<ai...@us...>]

Revision: 11392
          http://plplot.svn.sourceforge.net/plplot/?rev=11392&view=rev
Author:   airwin
Date:     2010-12-27 05:36:44 +0000 (Mon, 27 Dec 2010)

Log Message:
-----------
Configure test_octave.sh(.in) to limit tests when ENABLE_swig_octave
is ON.  Also, use plplot_octave (for now until I can figure out how to
wrap plplot_octave as the plplot_stub command) for the ENABLE_swig_octave=ON
case, and the usual plplot_stub for the (default) ENABLE_swig_octave=OFF case.

Modified Paths:
--------------
    trunk/plplot_test/CMakeLists.txt
    trunk/plplot_test/test_octave.sh.in

Modified: trunk/plplot_test/CMakeLists.txt
===================================================================
--- trunk/plplot_test/CMakeLists.txt	2010-12-27 02:00:22 UTC (rev 11391)
+++ trunk/plplot_test/CMakeLists.txt	2010-12-27 05:36:44 UTC (rev 11392)
@@ -70,13 +70,6 @@
     )
   list(APPEND SCRIPTS test_c_interactive.sh)
 
-  configure_file(
-    test_octave_interactive.sh.in
-    ${CMAKE_CURRENT_BINARY_DIR}/test_octave_interactive.sh
-    @ONLY
-    )
-  list(APPEND SCRIPTS test_octave_interactive.sh)
-
   add_test(examples_c
     ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=c"
     )
@@ -130,7 +123,22 @@
   endif(ENABLE_java)
 
   if(ENABLE_octave)
+    if(ENABLE_swig_octave)
+      set(swig_octave_comment)
+      set(matwrap_octave_comment "# (ignore for swig-generated case) ")
+    else(ENABLE_swig_octave)
+      set(matwrap_octave_comment)
+      set(swig_octave_comment "# (ignore for matwrap-generated case) ")
+    endif(ENABLE_swig_octave)
+
     configure_file(
+      test_octave_interactive.sh.in
+      ${CMAKE_CURRENT_BINARY_DIR}/test_octave_interactive.sh
+      @ONLY
+      )
+    list(APPEND SCRIPTS test_octave_interactive.sh)
+
+    configure_file(
       test_octave.sh.in
       ${CMAKE_CURRENT_BINARY_DIR}/test_octave.sh
       @ONLY

Modified: trunk/plplot_test/test_octave.sh.in
===================================================================
--- trunk/plplot_test/test_octave.sh.in	2010-12-27 02:00:22 UTC (rev 11391)
+++ trunk/plplot_test/test_octave.sh.in	2010-12-27 05:36:44 UTC (rev 11392)
@@ -42,7 +42,8 @@
     verbose_test = 0;
 endif
 
-plplot_stub;
+@swig_octave_comment@plplot_octave;
+@matwrap_octave_comment@plplot_stub;
 t = split("$options", "-"); 
 if (t); t(1,:)=""; endif;
 for i=1:rows(t)
@@ -57,7 +58,8 @@
 
 # Remove 7, 16 until plshade1 fix is done.
 
-for i=[1:6 8 9 13 15 21] ;
+@swig_octave_comment@for i=[] ;
+@matwrap_octave_comment@for i=[1:6 8 9 13 15 21] ;
     if (verbose_test)
 	printf("p%d\n",i);
     endif
@@ -68,7 +70,10 @@
 #plot equivalent of x??c examples.  These only required octave-2.0.x
 #Example 19 is not yet implemented
 failed = [] ;
-for i=[1:18 20:31 ] ;
+# Temporarily drop everything that involves arrays or returned values
+# until typemaps for swig-generated interface are done.
+@swig_octave_comment@for i=[10] ;
+@matwrap_octave_comment@for i=[1:18 20:31 ] ;
     ofile = sprintf("${OUTPUT_DIR}/x%.2d${lang}_${dsuffix}.txt",i);
     strm = fopen(ofile,"w");
     cmd = sprintf("x%.2dc",i);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.