[GRASS-SVN] r56826 - grass/trunk/lib/gpde/test

svn_grass at osgeo.org svn_grass at osgeo.org
Thu Jun 20 06:53:09 PDT 2013


Author: neteler
Date: 2013-06-20 06:53:08 -0700 (Thu, 20 Jun 2013)
New Revision: 56826

Added:
   grass/trunk/lib/gpde/test/test.gpde.lib.html
Modified:
   grass/trunk/lib/gpde/test/test_arrays.c
   grass/trunk/lib/gpde/test/test_assemble.c
   grass/trunk/lib/gpde/test/test_geom.c
   grass/trunk/lib/gpde/test/test_gradient.c
   grass/trunk/lib/gpde/test/test_gwflow.c
   grass/trunk/lib/gpde/test/test_heat.c
   grass/trunk/lib/gpde/test/test_les.c
   grass/trunk/lib/gpde/test/test_main.c
   grass/trunk/lib/gpde/test/test_solute_transport.c
   grass/trunk/lib/gpde/test/test_tools.c
Log:
gpde test suite: do not mark messages for gettext; added dummy HTML file for compilation

Added: grass/trunk/lib/gpde/test/test.gpde.lib.html
===================================================================
--- grass/trunk/lib/gpde/test/test.gpde.lib.html	                        (rev 0)
+++ grass/trunk/lib/gpde/test/test.gpde.lib.html	2013-06-20 13:53:08 UTC (rev 56826)
@@ -0,0 +1,11 @@
+<h2>DESCRIPTION</h2>
+
+Test suite.
+
+<h2>SEE ALSO</h2>
+
+<h2>AUTHOR</h2>
+
+Soeren Gebbert
+
+<p><i>Last changed: $Date$</i>


Property changes on: grass/trunk/lib/gpde/test/test.gpde.lib.html
___________________________________________________________________
Added: svn:mime-type
   + text/html
Added: svn:keywords
   + Author Date Id
Added: svn:eol-style
   + native

Modified: grass/trunk/lib/gpde/test/test_arrays.c
===================================================================
--- grass/trunk/lib/gpde/test/test_arrays.c	2013-06-20 13:27:09 UTC (rev 56825)
+++ grass/trunk/lib/gpde/test/test_arrays.c	2013-06-20 13:53:08 UTC (rev 56826)
@@ -19,7 +19,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <grass/glocale.h>
 #include <grass/N_pde.h>
 #include "test_gpde_lib.h"
 
@@ -45,18 +44,18 @@
     io_bench_2d();
     return sum;
 
-    G_message(_("\n++ Running array unit tests ++"));
+    G_message("\n++ Running array unit tests ++");
 
-    G_message(_("\t 1. testing 2d arrays"));
+    G_message("\t 1. testing 2d arrays");
     sum += test_array_2d();
 
-    G_message(_("\t 2. testing 3d arrays"));
+    G_message("\t 2. testing 3d arrays");
     sum += test_array_3d();
 
     if (sum > 0)
-	G_warning(_("\n-- Array unit tests failure --"));
+	G_warning("\n-- Array unit tests failure --");
     else
-	G_message(_("\n-- Array unit tests finished successfully --"));
+	G_message("\n-- Array unit tests finished successfully --");
 
     return sum;
 }

Modified: grass/trunk/lib/gpde/test/test_assemble.c
===================================================================
--- grass/trunk/lib/gpde/test/test_assemble.c	2013-06-20 13:27:09 UTC (rev 56825)
+++ grass/trunk/lib/gpde/test/test_assemble.c	2013-06-20 13:53:08 UTC (rev 56826)
@@ -20,7 +20,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <grass/glocale.h>
 #include <grass/N_pde.h>
 #include "test_gpde_lib.h"
 
@@ -39,18 +38,18 @@
 {
     int sum = 0;
 
-    G_message(_("\n++ Running assembling unit tests ++"));
+    G_message("\n++ Running assembling unit tests ++");
 
-    G_message(_("\t 1. testing 2d assembling"));
+    G_message("\t 1. testing 2d assembling");
     sum += test_matrix_assemble_2d();
 
-    G_message(_("\t 2. testing 3d assembling"));
+    G_message("\t 2. testing 3d assembling");
     sum += test_matrix_assemble_3d();
 
     if (sum > 0)
-	G_warning(_("\n-- Assembling unit tests failure --"));
+	G_warning("\n-- Assembling unit tests failure --");
     else
-	G_message(_("\n-- Assembling unit tests finished successfully --"));
+	G_message("\n-- Assembling unit tests finished successfully --");
 
     return sum;
 }

Modified: grass/trunk/lib/gpde/test/test_geom.c
===================================================================
--- grass/trunk/lib/gpde/test/test_geom.c	2013-06-20 13:27:09 UTC (rev 56825)
+++ grass/trunk/lib/gpde/test/test_geom.c	2013-06-20 13:53:08 UTC (rev 56826)
@@ -18,7 +18,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <grass/glocale.h>
 #include <grass/N_pde.h>
 #include <grass/raster3d.h>
 #include "test_gpde_lib.h"
@@ -33,14 +32,14 @@
 {
     int sum = 0;
 
-    G_message(_("\n++ Running geom_data unit tests ++"));
+    G_message("\n++ Running geom_data unit tests ++");
 
     sum += test_geom_data();
 
     if (sum > 0)
-	G_warning(_("\n-- geom_data unit tests failure --"));
+	G_warning("\n-- geom_data unit tests failure --");
     else
-	G_message(_("\n-- geom_data unit tests finished successfully --"));
+	G_message("\n-- geom_data unit tests finished successfully --");
 
     return sum;
 }

Modified: grass/trunk/lib/gpde/test/test_gradient.c
===================================================================
--- grass/trunk/lib/gpde/test/test_gradient.c	2013-06-20 13:27:09 UTC (rev 56825)
+++ grass/trunk/lib/gpde/test/test_gradient.c	2013-06-20 13:53:08 UTC (rev 56826)
@@ -20,7 +20,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <grass/glocale.h>
 #include <grass/N_pde.h>
 #include "test_gpde_lib.h"
 
@@ -39,18 +38,18 @@
 {
     int sum = 0;
 
-    G_message(_("\n++ Running gradient unit tests ++"));
+    G_message("\n++ Running gradient unit tests ++");
 
-    G_message(_("\t 1. testing 2d gradient"));
+    G_message("\t 1. testing 2d gradient");
     sum += test_gradient_2d();
 
-    G_message(_("\t 2. testing 3d gradient"));
+    G_message("\t 2. testing 3d gradient");
     sum += test_gradient_3d();
 
     if (sum > 0)
-	G_warning(_("\n-- Gradient unit tests failure --"));
+	G_warning("\n-- Gradient unit tests failure --");
     else
-	G_message(_("\n-- Gradient unit tests finished successfully --"));
+	G_message("\n-- Gradient unit tests finished successfully --");
 
     return sum;
 }

Modified: grass/trunk/lib/gpde/test/test_gwflow.c
===================================================================
--- grass/trunk/lib/gpde/test/test_gwflow.c	2013-06-20 13:27:09 UTC (rev 56825)
+++ grass/trunk/lib/gpde/test/test_gwflow.c	2013-06-20 13:53:08 UTC (rev 56826)
@@ -19,7 +19,6 @@
 
 
 #include <grass/gis.h>
-#include <grass/glocale.h>
 #include <grass/N_pde.h>
 #include <grass/gmath.h>
 #include <grass/N_gwflow.h>
@@ -44,18 +43,18 @@
 {
     int sum = 0;
 
-    G_message(_("\n++ Running gwflow integration tests ++"));
+    G_message("\n++ Running gwflow integration tests ++");
 
-    G_message(_("\t 1. testing 2d gwflow"));
+    G_message("\t 1. testing 2d gwflow");
     sum += test_gwflow_2d();
 
-    G_message(_("\t 2. testing 3d gwflow"));
+    G_message("\t 2. testing 3d gwflow");
     sum += test_gwflow_3d();
 
     if (sum > 0)
-	G_warning(_("\n-- gwflow integration tests failure --"));
+	G_warning("\n-- gwflow integration tests failure --");
     else
-	G_message(_("\n-- gwflow integration tests finished successfully --"));
+	G_message("\n-- gwflow integration tests finished successfully --");
 
     return sum;
 }

Modified: grass/trunk/lib/gpde/test/test_heat.c
===================================================================
--- grass/trunk/lib/gpde/test/test_heat.c	2013-06-20 13:27:09 UTC (rev 56825)
+++ grass/trunk/lib/gpde/test/test_heat.c	2013-06-20 13:53:08 UTC (rev 56826)
@@ -16,7 +16,6 @@
 *****************************************************************************/
 
 #include <grass/gis.h>
-#include <grass/glocale.h>
 #include <grass/N_pde.h>
 //#include <grass/N_heatflow.h>
 #include "test_gpde_lib.h"
@@ -30,16 +29,16 @@
 {
     int sum = 0;
 
-    G_message(_("\n++ Running heat flow integration tests ++"));
+    G_message("\n++ Running heat flow integration tests ++");
 
-    G_message(_("\t 1. testing 2d heat flow"));
+    G_message("\t 1. testing 2d heat flow");
 
-    G_message(_("\t 2. testing 3d heat flow"));
+    G_message("\t 2. testing 3d heat flow");
 
     if (sum > 0)
-	G_warning(_("\n-- heat flow integration tests failure --"));
+	G_warning("\n-- heat flow integration tests failure --");
     else
-	G_message(_("\n-- heat flow integration tests finished successfully --"));
+	G_message("\n-- heat flow integration tests finished successfully --");
 
     return sum;
 }

Modified: grass/trunk/lib/gpde/test/test_les.c
===================================================================
--- grass/trunk/lib/gpde/test/test_les.c	2013-06-20 13:27:09 UTC (rev 56825)
+++ grass/trunk/lib/gpde/test/test_les.c	2013-06-20 13:53:08 UTC (rev 56826)
@@ -16,7 +16,6 @@
 *****************************************************************************/
 
 #include <grass/gis.h>
-#include <grass/glocale.h>
 #include <grass/gmath.h>
 #include <grass/N_pde.h>
 #include "test_gpde_lib.h"
@@ -32,14 +31,14 @@
 {
     int sum = 0;
 
-    G_message(_("\n++ Running les creation unit tests ++"));
+    G_message("\n++ Running les creation unit tests ++");
 
     sum += test_les();
 
     if (sum > 0)
-	G_warning(_("\n-- les creation unit tests failure --"));
+	G_warning("\n-- les creation unit tests failure --");
     else
-	G_message(_("\n-- les creation unit tests finished successfully --"));
+	G_message("\n-- les creation unit tests finished successfully --");
 
     return sum;
 }
@@ -93,7 +92,7 @@
     sples = N_alloc_les(TEST_N_NUM_ROWS, N_SPARSE_LES);
 
 
-    G_message(_("\t * testing les creation in parallel\n"));
+    G_message("\t * testing les creation in parallel\n");
 #pragma omp parallel for private(i, j) shared(les)
     for (i = 0; i < TEST_N_NUM_ROWS; i++) {
 	for (j = 0; j < TEST_N_NUM_ROWS; j++) {
@@ -124,7 +123,7 @@
     N_free_les(les);
     N_free_les(sples);
 
-    G_message(_("\t * testing les creation in serial\n"));
+    G_message("\t * testing les creation in serial\n");
 
     les = N_alloc_les(TEST_N_NUM_ROWS, N_NORMAL_LES);
     sples = N_alloc_les(TEST_N_NUM_ROWS, N_SPARSE_LES);

Modified: grass/trunk/lib/gpde/test/test_main.c
===================================================================
--- grass/trunk/lib/gpde/test/test_main.c	2013-06-20 13:27:09 UTC (rev 56825)
+++ grass/trunk/lib/gpde/test/test_main.c	2013-06-20 13:53:08 UTC (rev 56826)
@@ -19,7 +19,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <grass/gis.h>
-#include <grass/glocale.h>
 #include <grass/N_pde.h>
 #include <grass/gmath.h>
 #include "test_gpde_lib.h"
@@ -47,27 +46,27 @@
     param.unit->type = TYPE_STRING;
     param.unit->required = NO;
     param.unit->options = "array,assemble,geom,gradient,les,tools";
-    param.unit->description = _("Choose the unit tests to run");
+    param.unit->description = "Choose the unit tests to run";
 
     param.integration = G_define_option();
     param.integration->key = "integration";
     param.integration->type = TYPE_STRING;
     param.integration->required = NO;
     param.integration->options = "gwflow,heatflow,transport";
-    param.integration->description = _("Choose the integration tests to run");
+    param.integration->description = "Choose the integration tests to run";
 
 
     param.testunit = G_define_flag();
     param.testunit->key = 'u';
-    param.testunit->description = _("Run all unit tests");
+    param.testunit->description = "Run all unit tests";
 
     param.testint = G_define_flag();
     param.testint->key = 'i';
-    param.testint->description = _("Run all integration tests");
+    param.testint->description = "Run all integration tests";
 
     param.full = G_define_flag();
     param.full->key = 'a';
-    param.full->description = _("Run all unit and integration tests");
+    param.full->description = "Run all unit and integration tests";
 
 }
 

Modified: grass/trunk/lib/gpde/test/test_solute_transport.c
===================================================================
--- grass/trunk/lib/gpde/test/test_solute_transport.c	2013-06-20 13:27:09 UTC (rev 56825)
+++ grass/trunk/lib/gpde/test/test_solute_transport.c	2013-06-20 13:53:08 UTC (rev 56826)
@@ -16,7 +16,6 @@
 *****************************************************************************/
 
 #include <grass/gis.h>
-#include <grass/glocale.h>
 #include <grass/N_pde.h>
 #include <grass/N_solute_transport.h>
 #include "test_gpde_lib.h"
@@ -40,19 +39,18 @@
 {
     int sum = 0;
 
-    G_message(_("\n++ Running solute_transport integration tests ++"));
+    G_message("\n++ Running solute_transport integration tests ++");
 
-    G_message(_("\t 1. testing 2d solute_transport"));
+    G_message("\t 1. testing 2d solute_transport");
     sum += test_solute_transport_2d();
 
-    G_message(_("\t 2. testing 3d solute_transport"));
+    G_message("\t 2. testing 3d solute_transport");
     sum += test_solute_transport_3d();
 
     if (sum > 0)
-	G_warning(_("\n-- solute_transport integration tests failure --"));
+	G_warning("\n-- solute_transport integration tests failure --");
     else
-	G_message(_
-		  ("\n-- solute_transport integration tests finished successfully --"));
+	G_message("\n-- solute_transport integration tests finished successfully --");
 
     return sum;
 }

Modified: grass/trunk/lib/gpde/test/test_tools.c
===================================================================
--- grass/trunk/lib/gpde/test/test_tools.c	2013-06-20 13:27:09 UTC (rev 56825)
+++ grass/trunk/lib/gpde/test/test_tools.c	2013-06-20 13:53:08 UTC (rev 56826)
@@ -16,7 +16,6 @@
 *****************************************************************************/
 
 #include <grass/gis.h>
-#include <grass/glocale.h>
 #include <grass/N_pde.h>
 #include "test_gpde_lib.h"
 
@@ -31,14 +30,14 @@
 {
     int sum = 0;
 
-    G_message(_("\n++ Running math tool unit tests ++"));
+    G_message("\n++ Running math tool unit tests ++");
 
     sum += test_mean_calc();
 
     if (sum > 0)
-	G_warning(_("\n-- math tool unit tests failure --"));
+	G_warning("\n-- math tool unit tests failure --");
     else
-	G_message(_("\n-- math tool unit tests finished successfully --"));
+	G_message("\n-- math tool unit tests finished successfully --");
 
     return sum;
 }



More information about the grass-commit mailing list