[svn:parrot] r41716 - in branches/library_files/config: gen/makefiles init

[jkeenan at svn.parrot.org]

Author: jkeenan
Date: Sun Oct  4 22:45:09 2009
New Revision: 41716
URL: https://trac.parrot.org/parrot/changeset/41716

Log:
Make lists of tests defined in Parrot::Harness::DefaultTests available to Makefile.  Add them to Parrot::Configure object in config/init/defaults.pm, then modify make targets in config/gen/makefiles/root.in.  Cf.:  https://trac.parrot.org/parrot/ticket/1061.

Modified:
   branches/library_files/config/gen/makefiles/root.in
   branches/library_files/config/init/defaults.pm

Modified: branches/library_files/config/gen/makefiles/root.in
==============================================================================
--- branches/library_files/config/gen/makefiles/root.in	Sun Oct  4 22:38:55 2009	(r41715)
+++ branches/library_files/config/gen/makefiles/root.in	Sun Oct  4 22:45:09 2009	(r41716)
@@ -1417,14 +1417,7 @@
     t/src/*.t
 TOOLS_TEST_FILES := \
     t/tools/*.t
-EXTRA_TEST_FILES := \
-    t/compilers/pct/*.t \
-    t/compilers/pge/*.t \
-    t/compilers/pge/p5regex/*.t \
-    t/compilers/pge/perl6regex/*.t \
-    t/compilers/tge/*.t \
-    t/library/*.t \
-    t/tools/*.t
+LIBRARY_TEST_FILES := @library_tests@
 PMC2CUTILS_DIR := t/tools/pmc2cutils
 OPS2PMUTILS_DIR := t/tools/ops2pm
 OPS2CUTILS_DIR := t/tools/ops2cutils
@@ -1451,10 +1444,6 @@
 # We probably need a complete build before running the tests.
 test_prep : all
 
-# We always want to test annotations are persisted in PBC during make test.
-test_pbc_annotation_persistence : test_prep
-	$(PERL) t/harness $(EXTRA_TEST_ARGS) -r t/op/annotate.t
-
 # Run test cases with a single call of t/harness. Users have to look at only
 # one report. The default set of tests to run is contained in t/harness,
 # make any edits there. Some tests are run in a separate harness only because
@@ -1464,7 +1453,7 @@
 test : test_core nqp_test
 
 # Test Parrot core.
-test_core: test_prep test_pbc_annotation_persistence
+test_core: test_prep 
 	$(PERL) t/harness $(EXTRA_TEST_ARGS)
 
 # Test the NQP compiler
@@ -1500,7 +1489,7 @@
 	src_tests \
 	run_tests \
 	perl_tests \
-	extra_tests \
+	library_tests \
 	nqp_test \
 	codetest \
 	benchmark_tests \
@@ -1596,9 +1585,9 @@
 configure_tests :
 	$(PERL) t/harness $(CONFIGURE_TEST_FILES)
 
-# extra tests - tests run by make test but not by make fulltest or make cover
-extra_tests : test_prep
-	$(PERL) t/harness $(EXTRA_TEST_ARGS) $(EXTRA_TEST_FILES)
+# library tests - tests run by make test but not by make fulltest or make cover
+library_tests : test_prep
+	$(PERL) t/harness $(EXTRA_TEST_ARGS) $(LIBRARY_TEST_FILES)
 
 ###############################################################################
 #
@@ -2113,7 +2102,7 @@
 	- at make@ perl_tests
 
 cover-extra: cover.dummy
-	- at make@ extra_tests
+	- at make@ library_tests
 
 cover-codingstd: cover.dummy
 	- at make@ codingstd_tests

Modified: branches/library_files/config/init/defaults.pm
==============================================================================
--- branches/library_files/config/init/defaults.pm	Sun Oct  4 22:38:55 2009	(r41715)
+++ branches/library_files/config/init/defaults.pm	Sun Oct  4 22:45:09 2009	(r41716)
@@ -20,8 +20,9 @@
 
 use Config;
 use FindBin;    # see build_dir
-use Parrot::Configure::Step;
 use Parrot::BuildUtil;
+use Parrot::Configure::Step;
+use Parrot::Harness::DefaultTests ();
 use Cwd qw(abs_path);
 use File::Spec;
 
@@ -266,6 +267,8 @@
     # remember corrected archname - jit.pm was using $Config('archname')
     _64_bit_adjustments($conf);
 
+    _set_default_tests($conf);
+
     return 1;
 }
 
@@ -299,6 +302,20 @@
     return 1;
 }
 
+sub _set_default_tests {
+    my $conf = shift;
+    $conf->data->set( 'runcore_tests' =>
+        ( join ' ' => @Parrot::Harness::DefaultTests::runcore_tests ) );
+    $conf->data->set( 'core_tests' =>
+        ( join ' ' => @Parrot::Harness::DefaultTests::core_tests ) );
+    $conf->data->set( 'library_tests' =>
+        ( join ' ' => @Parrot::Harness::DefaultTests::library_tests ) );
+    $conf->data->set( 'configure_tests' =>
+        ( join ' ' => @Parrot::Harness::DefaultTests::configure_tests ) );
+    $conf->data->set( 'developing_tests' =>
+        ( join ' ' => @Parrot::Harness::DefaultTests::developing_tests ) );
+}
+
 1;
 
 # Local Variables: