seed r682 - in trunk/tests: . c

[hortont svn gnome org]

Author: hortont
Date: Thu Jan  8 08:28:13 2009
New Revision: 682
URL: http://svn.gnome.org/viewvc/seed?rev=682&view=rev

Log:
C Tests don't disable asserts (yay!) and stuff now.


Added:
   trunk/tests/c/basic.c   (contents, props changed)
      - copied, changed from r680, /trunk/tests/c/test-tests.c
   trunk/tests/c/main.c   (contents, props changed)
      - copied, changed from r680, /trunk/tests/c/test-main.c
Removed:
   trunk/tests/c/test-main.c
   trunk/tests/c/test-tests.c
Modified:
   trunk/tests/c/Makefile.am
   trunk/tests/run-tests.py

Modified: trunk/tests/c/Makefile.am
==============================================================================
--- trunk/tests/c/Makefile.am	(original)
+++ trunk/tests/c/Makefile.am	Thu Jan  8 08:28:13 2009
@@ -1,22 +1,12 @@
-# Mostly stolen from Clutter.
-
-NULL =
-
 noinst_PROGRAMS = test
 
-test_SOURCES =				\
-	test-main.c				\
-	test-tests.c			\
-	$(NULL)
+test_SOURCES =					\
+	main.c						\
+	basic.c
 	
 test_CFLAGS = -Wall				\
-	 $(SEED_DEBUG_CFLAGS)		\
-	 $(SEED_PROFILE_CFLAGS)		\
 	 $(SEED_CFLAGS)
 
 test_LDADD = $(SEED_LIBS) -lseed
-test_LDFLAGS = -L../../libseed/.libs -lseed -lreadline $(SEED_PROFILE_LDFLAGS)
-
-#test:
-#	@gtester -o=test-results.xml ./test
+test_LDFLAGS = -L../../libseed/.libs -lseed -lreadline
 

Copied: trunk/tests/c/basic.c (from r680, /trunk/tests/c/test-tests.c)
==============================================================================
--- /trunk/tests/c/test-tests.c	(original)
+++ trunk/tests/c/basic.c	Thu Jan  8 08:28:13 2009
@@ -1,8 +1,7 @@
 #include "../../libseed/seed.h"
 #include "test-common.h"
 
-void
-test_tests (TestSimpleFixture *fixture, gconstpointer _data)
+void basic (TestSimpleFixture * fixture, gconstpointer _data)
 {
 	g_assert(1);
 }

Copied: trunk/tests/c/main.c (from r680, /trunk/tests/c/test-main.c)
==============================================================================
--- /trunk/tests/c/test-main.c	(original)
+++ trunk/tests/c/main.c	Thu Jan  8 08:28:13 2009
@@ -21,32 +21,15 @@
 				FUNC,													\
 				test_simple_fixture_teardown);
 
-
-void test_simple_fixture_setup (TestSimpleFixture *fixture,
-					gconstpointer data);
-void test_simple_fixture_teardown (TestSimpleFixture *fixture,
-					   gconstpointer data);
-
-/*
- * Initialise stuff before each test is run
- */
-void
-test_simple_fixture_setup (TestSimpleFixture *fixture, gconstpointer data)
+void test_simple_fixture_setup (TestSimpleFixture *fixture, gconstpointer data)
 {
 }
 
-
-/*
- * Cleanup stuff after each test has finished
- */
-void
-test_simple_fixture_teardown (TestSimpleFixture *fixture, gconstpointer data)
+void test_simple_fixture_teardown (TestSimpleFixture *fixture, gconstpointer data)
 {
-
 }
 
-int
-main (int argc, char **argv)
+int main (int argc, char **argv)
 {
 	TestSharedState *shared_state = g_new0(TestSharedState, 1);
 	const gchar * display = g_getenv ("DISPLAY");
@@ -61,12 +44,12 @@
 
 	//g_test_bug_base ("http://bugzilla.openedhand.com/show_bug.cgi?id=%s";);
 
-	g_assert (seed_init(shared_state->argc_addr, shared_state->argv_addr) == 0);
+	g_assert(seed_init(shared_state->argc_addr, shared_state->argv_addr) == 0);
 
 	shared_state->argc_addr = &argc;
 	shared_state->argv_addr = &argv;
 
-	TEST_SIMPLE ("/tests", test_tests);
+	TEST_SIMPLE ("/tests", basic);
 
 	return g_test_run ();
 }

Modified: trunk/tests/run-tests.py
==============================================================================
--- trunk/tests/run-tests.py	(original)
+++ trunk/tests/run-tests.py	Thu Jan  8 08:28:13 2009
@@ -49,7 +49,8 @@
 			passed.append([f,test_out,run_out])
 			sys.stdout.write(".")
 		sys.stdout.flush()
-print
+
+#p = subprocess.Popen("
 
 revnof = os.popen("svn info | grep \"Revision\"")
 revno = "".join(revnof.readlines()).rstrip()