[the-board] [test] General fixed in test build files

[Lucas Rocha <lucasr src gnome org>]

commit 534024bf8597d7a359de7221486ea2216015d7b8
Author: Lucas Rocha <lucasr gnome org>
Date:   Fri Feb 11 18:25:58 2011 +0000

    [test] General fixed in test build files

 .gitignore        |    1 +
 test/Makefile.am  |   16 +++++++++-------
 test/tb-js-unit.c |    8 --------
 3 files changed, 10 insertions(+), 15 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2fd4768..1a99ebf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -92,3 +92,4 @@
 /so_locations
 /stamp-h1
 /tags
+/test/user-data
diff --git a/test/Makefile.am b/test/Makefile.am
index 52acdf9..e0df40d 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -22,11 +22,11 @@ THE_BOARD_GJS_PATH = $(abs_top_builddir)/.libs:$(abs_top_srcdir)/src/js
 
 # Default log output, overrideable from environment, thanks to
 # conditional assignment operator '?=' .
-THE_BOARD_TEST_LOGS_OUTPUT ?= $(builddir)/test_user_data/logs/the-board-%u.log
+THE_BOARD_TEST_LOGS_OUTPUT ?= $(builddir)/user-data/the-board-%u.log
 
 TESTS_ENVIRONMENT = \
 	DISPLAY='' \
-	XDG_DATA_HOME=$(abs_top_builddir)/test_user_data \
+	XDG_DATA_HOME=$(abs_top_builddir)/user-data \
     GJS_DEBUG_OUTPUT=$(THE_BOARD_TEST_LOGS_OUTPUT) \
 	GI_TYPELIB_PATH=$(abs_top_builddir)/src \
 	JS_TEST_DIR=$(abs_top_builddir)/test/js \ 
@@ -40,8 +40,8 @@ test-/%:
 
 # test: run all tests in cwd
 test: ${TEST_PROGS}
-	@rm -rf test_user_data
-	@mkdir -p test_user_data
+	@rm -rf user-data
+	@mkdir -p user-data
 	@test -z "${TEST_PROGS}" || ${GTESTER} --verbose ${TEST_PROGS} ${TEST_PROGS_OPTIONS}
 
 # test-report: run tests in cwd and generate report
@@ -72,7 +72,9 @@ check-local: test
 clean-local:
 	-rm -rf test-coverage
 	-rm -f *.gcda *.gcno
-	-rm -rf test_user_data
+	-rm -rf user-data
 
-#noinst_jsdirs = \
-#	js
+noinst_jsdirs = \
+	js
+
+-include $(top_srcdir)/git.mk
diff --git a/test/tb-js-unit.c b/test/tb-js-unit.c
index 580c454..f2a621d 100644
--- a/test/tb-js-unit.c
+++ b/test/tb-js-unit.c
@@ -21,9 +21,6 @@ setup (TbTestJSFixture *fix,
   gboolean success;
   int code;
 
-  g_debug ("------------------------------");
-  g_debug ("setup gjs test file: %s", (const char*) test_data);
-
   fix->context = gjs_context_new ();
 
   /* Load jsUnit.js directly into global scope, rather than
@@ -42,11 +39,8 @@ static void
 teardown (TbTestJSFixture *fix,
           gconstpointer     test_data)
 {
-  g_debug ("teardown gjs test file: %s", (const char*) test_data);
-
   gjs_memory_report ("before destroying context", FALSE);
   g_object_unref (fix->context);
-
   gjs_memory_report ("after destroying context", TRUE);
 }
 
@@ -59,8 +53,6 @@ test (TbTestJSFixture *fix,
   gboolean success;
   int code;
 
-  g_debug ("test gjs test file: %s", (const char*) test_data);
-
   /* verify that last line of test is either 'gjstestRun();' or 'st;'
      this ensures that we accurately report the results of the test!
      otherwise gjstestRun() can fail silently, which is Not Good.