[Openvas-commits] r3544 - in trunk/openvas-manager: . src/tests

scm-commit@wald.intevation.org scm-commit at wald.intevation.org
Fri May 29 20:37:32 CEST 2009


Author: mattm
Date: 2009-05-29 20:37:31 +0200 (Fri, 29 May 2009)
New Revision: 3544

Modified:
   trunk/openvas-manager/ChangeLog
   trunk/openvas-manager/src/tests/CMakeLists.txt
   trunk/openvas-manager/src/tests/omp_abort_task_0.c
   trunk/openvas-manager/src/tests/omp_delete_task_0.c
   trunk/openvas-manager/src/tests/omp_delete_task_1.c
   trunk/openvas-manager/src/tests/omp_start_task_0.c
   trunk/openvas-manager/src/tests/omp_start_task_1.c
   trunk/openvas-manager/src/tests/omp_start_task_2.c
   trunk/openvas-manager/src/tests/report_path_task_uuid_0.c
   trunk/openvas-manager/src/tests/report_path_task_uuid_1.c
   trunk/openvas-manager/src/tests/report_path_task_uuid_2.c
   trunk/openvas-manager/src/tests/rmdir_recursively_0.c
   trunk/openvas-manager/src/tests/rmdir_recursively_1.c
   trunk/openvas-manager/src/tests/strip_space_0.c
   trunk/openvas-manager/src/tests/strip_space_1.c
   trunk/openvas-manager/src/tests/strip_space_2.c
   trunk/openvas-manager/src/tests/strip_space_3.c
Log:
	Make the tests compile and run again.

	* src/tests/report_path_task_uuid_1.c,
	src/tests/report_path_task_uuid_0.c,
	src/tests/report_path_task_uuid_2.c: Comment out setup_test and common.h
	include.

	* src/tests/strip_space_0.c, src/tests/strip_space_2.c,
	src/tests/strip_space_3.c, src/tests/strip_space_1.c,
	src/tests/rmdir_recursively_0.c, src/tests/rmdir_recursively_1.c: Include
	common.h.

	* src/tests/omp_start_task_2.c, src/tests/omp_abort_task_0.c,
	src/tests/omp_delete_task_0.c, src/tests/omp_start_task_1.c,
	src/tests/omp_delete_task_1.c, src/tests/omp_start_task_0.c: Turn on
	TRACE.

	* src/tests/CMakeLists.txt (rmdir_recursively_0, rmdir_recursively_1)
	strip_space_0, strip_space_1, strip_space_2, strip_space_3): Link to
	common and requirement of common.

Modified: trunk/openvas-manager/ChangeLog
===================================================================
--- trunk/openvas-manager/ChangeLog	2009-05-29 18:04:44 UTC (rev 3543)
+++ trunk/openvas-manager/ChangeLog	2009-05-29 18:37:31 UTC (rev 3544)
@@ -1,5 +1,28 @@
 2009-05-29  Matthew Mundell <mmundell at intevation.de>
 
+	Make the tests compile and run again.
+
+	* src/tests/report_path_task_uuid_1.c,
+	src/tests/report_path_task_uuid_0.c,
+	src/tests/report_path_task_uuid_2.c: Comment out setup_test and common.h
+	include.
+
+	* src/tests/strip_space_0.c, src/tests/strip_space_2.c,
+	src/tests/strip_space_3.c, src/tests/strip_space_1.c,
+	src/tests/rmdir_recursively_0.c, src/tests/rmdir_recursively_1.c: Include
+	common.h.
+
+	* src/tests/omp_start_task_2.c, src/tests/omp_abort_task_0.c,
+	src/tests/omp_delete_task_0.c, src/tests/omp_start_task_1.c,
+	src/tests/omp_delete_task_1.c, src/tests/omp_start_task_0.c: Turn on
+	TRACE.
+
+	* src/tests/CMakeLists.txt (rmdir_recursively_0, rmdir_recursively_1)
+	strip_space_0, strip_space_1, strip_space_2, strip_space_3): Link to
+	common and requirement of common.
+
+2009-05-29  Matthew Mundell <mmundell at intevation.de>
+
 	* src/tests/omp_abort_task_0.c, src/tests/omp_create_task_0.c,
 	src/tests/omp_delete_report_0.c, src/tests/omp_delete_report_1.c,
 	src/tests/omp_delete_task_0.c, src/tests/omp_delete_task_1.c,

Modified: trunk/openvas-manager/src/tests/CMakeLists.txt
===================================================================
--- trunk/openvas-manager/src/tests/CMakeLists.txt	2009-05-29 18:04:44 UTC (rev 3543)
+++ trunk/openvas-manager/src/tests/CMakeLists.txt	2009-05-29 18:37:31 UTC (rev 3544)
@@ -63,13 +63,15 @@
 add_executable (rmdir_recursively_0 rmdir_recursively_0.c)
 target_link_libraries (rmdir_recursively_0 file)
 set_target_properties (rmdir_recursively_0 PROPERTIES COMPILE_FLAGS "-I .. ${GLIB_CFLAGS}")
-set_target_properties (rmdir_recursively_0 PROPERTIES LINK_FLAGS "${GLIB_LDFLAGS}")
+set_target_properties (rmdir_recursively_0 PROPERTIES LINK_FLAGS "${OVAS_LDFLAG} ${GLIB_LDFLAGS}")
+target_link_libraries (rmdir_recursively_0 common)
 ADD_TEST (rmdir_recursively_0 rmdir_recursively_0)
 
 add_executable (rmdir_recursively_1 rmdir_recursively_1.c)
 target_link_libraries (rmdir_recursively_1 file)
 set_target_properties (rmdir_recursively_1 PROPERTIES COMPILE_FLAGS "-I .. ${GLIB_CFLAGS}")
-set_target_properties (rmdir_recursively_1 PROPERTIES LINK_FLAGS "${GLIB_LDFLAGS}")
+set_target_properties (rmdir_recursively_1 PROPERTIES LINK_FLAGS "${OVAS_LDFLAG} ${GLIB_LDFLAGS}")
+target_link_libraries (rmdir_recursively_1 common)
 ADD_TEST (rmdir_recursively_1 rmdir_recursively_1)
 
 add_executable (report_path_task_uuid_0 report_path_task_uuid_0.c)
@@ -93,25 +95,29 @@
 add_executable (strip_space_0 strip_space_0.c)
 target_link_libraries (strip_space_0 string)
 set_target_properties (strip_space_0 PROPERTIES COMPILE_FLAGS "-I .. ${GLIB_CFLAGS}")
-set_target_properties (strip_space_0 PROPERTIES LINK_FLAGS "${GLIB_LDFLAGS}")
+set_target_properties (strip_space_0 PROPERTIES LINK_FLAGS "${OVAS_LDFLAG} ${GLIB_LDFLAGS}")
+target_link_libraries (strip_space_0 common)
 ADD_TEST (strip_space_0 strip_space_0)
 
 add_executable (strip_space_1 strip_space_1.c)
 target_link_libraries (strip_space_1 string)
 set_target_properties (strip_space_1 PROPERTIES COMPILE_FLAGS "-I .. ${GLIB_CFLAGS}")
-set_target_properties (strip_space_1 PROPERTIES LINK_FLAGS "${GLIB_LDFLAGS}")
+set_target_properties (strip_space_1 PROPERTIES LINK_FLAGS "${OVAS_LDFLAG} ${GLIB_LDFLAGS}")
+target_link_libraries (strip_space_1 common)
 ADD_TEST (strip_space_1 strip_space_1)
 
 add_executable (strip_space_2 strip_space_2.c)
 target_link_libraries (strip_space_2 string)
 set_target_properties (strip_space_2 PROPERTIES COMPILE_FLAGS "-I .. ${GLIB_CFLAGS}")
-set_target_properties (strip_space_2 PROPERTIES LINK_FLAGS "${GLIB_LDFLAGS}")
+set_target_properties (strip_space_2 PROPERTIES LINK_FLAGS "${OVAS_LDFLAG} ${GLIB_LDFLAGS}")
+target_link_libraries (strip_space_2 common)
 ADD_TEST (strip_space_2 strip_space_2)
 
 add_executable (strip_space_3 strip_space_3.c)
 target_link_libraries (strip_space_3 string)
 set_target_properties (strip_space_3 PROPERTIES COMPILE_FLAGS "-I .. ${GLIB_CFLAGS}")
-set_target_properties (strip_space_3 PROPERTIES LINK_FLAGS "${GLIB_LDFLAGS}")
+set_target_properties (strip_space_3 PROPERTIES LINK_FLAGS "${OVAS_LDFLAG} ${GLIB_LDFLAGS}")
+target_link_libraries (strip_space_3 common)
 ADD_TEST (strip_space_3 strip_space_3)
 
 ## Tests of the manager

Modified: trunk/openvas-manager/src/tests/omp_abort_task_0.c
===================================================================
--- trunk/openvas-manager/src/tests/omp_abort_task_0.c	2009-05-29 18:04:44 UTC (rev 3543)
+++ trunk/openvas-manager/src/tests/omp_abort_task_0.c	2009-05-29 18:37:31 UTC (rev 3544)
@@ -23,7 +23,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#define TRACE 0
+#define TRACE 1
 
 #include <stdio.h>
 #include <stdlib.h>

Modified: trunk/openvas-manager/src/tests/omp_delete_task_0.c
===================================================================
--- trunk/openvas-manager/src/tests/omp_delete_task_0.c	2009-05-29 18:04:44 UTC (rev 3543)
+++ trunk/openvas-manager/src/tests/omp_delete_task_0.c	2009-05-29 18:37:31 UTC (rev 3544)
@@ -23,7 +23,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#define TRACE 0
+#define TRACE 1
 
 #include <stdio.h>
 #include <stdlib.h>

Modified: trunk/openvas-manager/src/tests/omp_delete_task_1.c
===================================================================
--- trunk/openvas-manager/src/tests/omp_delete_task_1.c	2009-05-29 18:04:44 UTC (rev 3543)
+++ trunk/openvas-manager/src/tests/omp_delete_task_1.c	2009-05-29 18:37:31 UTC (rev 3544)
@@ -23,7 +23,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#define TRACE 0
+#define TRACE 1
 
 #include <stdio.h>
 #include <stdlib.h>

Modified: trunk/openvas-manager/src/tests/omp_start_task_0.c
===================================================================
--- trunk/openvas-manager/src/tests/omp_start_task_0.c	2009-05-29 18:04:44 UTC (rev 3543)
+++ trunk/openvas-manager/src/tests/omp_start_task_0.c	2009-05-29 18:37:31 UTC (rev 3544)
@@ -23,7 +23,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#define TRACE 0
+#define TRACE 1
 
 #include <stdio.h>
 #include <stdlib.h>

Modified: trunk/openvas-manager/src/tests/omp_start_task_1.c
===================================================================
--- trunk/openvas-manager/src/tests/omp_start_task_1.c	2009-05-29 18:04:44 UTC (rev 3543)
+++ trunk/openvas-manager/src/tests/omp_start_task_1.c	2009-05-29 18:37:31 UTC (rev 3544)
@@ -23,7 +23,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#define TRACE 0
+#define TRACE 1
 
 #include <stdio.h>
 #include <stdlib.h>

Modified: trunk/openvas-manager/src/tests/omp_start_task_2.c
===================================================================
--- trunk/openvas-manager/src/tests/omp_start_task_2.c	2009-05-29 18:04:44 UTC (rev 3543)
+++ trunk/openvas-manager/src/tests/omp_start_task_2.c	2009-05-29 18:37:31 UTC (rev 3544)
@@ -23,7 +23,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#define TRACE 0
+#define TRACE 1
 
 #include <stdio.h>
 #include <stdlib.h>

Modified: trunk/openvas-manager/src/tests/report_path_task_uuid_0.c
===================================================================
--- trunk/openvas-manager/src/tests/report_path_task_uuid_0.c	2009-05-29 18:04:44 UTC (rev 3543)
+++ trunk/openvas-manager/src/tests/report_path_task_uuid_0.c	2009-05-29 18:37:31 UTC (rev 3544)
@@ -27,14 +27,15 @@
 #include <stdlib.h>
 #include <string.h>
 
+//#include "common.h"
 #include "../manage.h"
 
 int
 main ()
 {
   gchar* name;
-  int ret
-  setup_test ();
+  int ret;
+  //setup_test ();
   name = report_path_task_uuid ("/var/lib/openvas/mgr/users/user/tasks/01-abc-02001020/reports/report-id");
   ret = strcmp (name, "01-abc-02001020");
   g_free (name);

Modified: trunk/openvas-manager/src/tests/report_path_task_uuid_1.c
===================================================================
--- trunk/openvas-manager/src/tests/report_path_task_uuid_1.c	2009-05-29 18:04:44 UTC (rev 3543)
+++ trunk/openvas-manager/src/tests/report_path_task_uuid_1.c	2009-05-29 18:37:31 UTC (rev 3544)
@@ -27,6 +27,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+//#include "common.h"
 #include "../manage.h"
 
 int
@@ -34,7 +35,7 @@
 {
   gchar* name;
   int ret;
-  setup_test ();
+  //setup_test ();
   name = report_path_task_uuid ("/var/lib/openvas/mgr/users/user/tasks/01-abc-02001020/reports/report-id/");
   ret = strcmp (name, "01-abc-02001020");
   g_free (name);

Modified: trunk/openvas-manager/src/tests/report_path_task_uuid_2.c
===================================================================
--- trunk/openvas-manager/src/tests/report_path_task_uuid_2.c	2009-05-29 18:04:44 UTC (rev 3543)
+++ trunk/openvas-manager/src/tests/report_path_task_uuid_2.c	2009-05-29 18:37:31 UTC (rev 3544)
@@ -27,6 +27,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+//#include "common.h"
 #include "../manage.h"
 
 int
@@ -34,7 +35,7 @@
 {
   gchar* name;
   int ret;
-  setup_test ();
+  //setup_test ();
   name = report_path_task_uuid ("01-abc-02001020/reports/report-id/");
   ret = strcmp (name, "01-abc-02001020");
   g_free (name);

Modified: trunk/openvas-manager/src/tests/rmdir_recursively_0.c
===================================================================
--- trunk/openvas-manager/src/tests/rmdir_recursively_0.c	2009-05-29 18:04:44 UTC (rev 3543)
+++ trunk/openvas-manager/src/tests/rmdir_recursively_0.c	2009-05-29 18:37:31 UTC (rev 3544)
@@ -30,6 +30,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
+#include "common.h"
 #include "../file.h"
 
 int

Modified: trunk/openvas-manager/src/tests/rmdir_recursively_1.c
===================================================================
--- trunk/openvas-manager/src/tests/rmdir_recursively_1.c	2009-05-29 18:04:44 UTC (rev 3543)
+++ trunk/openvas-manager/src/tests/rmdir_recursively_1.c	2009-05-29 18:37:31 UTC (rev 3544)
@@ -31,6 +31,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
+#include "common.h"
 #include "../file.h"
 
 int

Modified: trunk/openvas-manager/src/tests/strip_space_0.c
===================================================================
--- trunk/openvas-manager/src/tests/strip_space_0.c	2009-05-29 18:04:44 UTC (rev 3543)
+++ trunk/openvas-manager/src/tests/strip_space_0.c	2009-05-29 18:37:31 UTC (rev 3544)
@@ -27,6 +27,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "common.h"
 #include "../string.h"
 
 int

Modified: trunk/openvas-manager/src/tests/strip_space_1.c
===================================================================
--- trunk/openvas-manager/src/tests/strip_space_1.c	2009-05-29 18:04:44 UTC (rev 3543)
+++ trunk/openvas-manager/src/tests/strip_space_1.c	2009-05-29 18:37:31 UTC (rev 3544)
@@ -27,6 +27,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "common.h"
 #include "../string.h"
 
 int

Modified: trunk/openvas-manager/src/tests/strip_space_2.c
===================================================================
--- trunk/openvas-manager/src/tests/strip_space_2.c	2009-05-29 18:04:44 UTC (rev 3543)
+++ trunk/openvas-manager/src/tests/strip_space_2.c	2009-05-29 18:37:31 UTC (rev 3544)
@@ -27,6 +27,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "common.h"
 #include "../string.h"
 
 int

Modified: trunk/openvas-manager/src/tests/strip_space_3.c
===================================================================
--- trunk/openvas-manager/src/tests/strip_space_3.c	2009-05-29 18:04:44 UTC (rev 3543)
+++ trunk/openvas-manager/src/tests/strip_space_3.c	2009-05-29 18:37:31 UTC (rev 3544)
@@ -27,6 +27,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "common.h"
 #include "../string.h"
 
 int



More information about the Openvas-commits mailing list