[svn:parrot] r45218 - in branches/profiling_testing: config/gen/makefiles t/profiling

[cotto at svn.parrot.org]

Author: cotto
Date: Sat Mar 27 23:57:06 2010
New Revision: 45218
URL: https://trac.parrot.org/parrot/changeset/45218

Log:
[profiling] use pbc_merge to build ProfTest.pbc

Modified:
   branches/profiling_testing/config/gen/makefiles/root.in
   branches/profiling_testing/t/profiling/profiling.t

Modified: branches/profiling_testing/config/gen/makefiles/root.in
==============================================================================
--- branches/profiling_testing/config/gen/makefiles/root.in	Sat Mar 27 23:56:28 2010	(r45217)
+++ branches/profiling_testing/config/gen/makefiles/root.in	Sat Mar 27 23:57:06 2010	(r45218)
@@ -1046,20 +1046,30 @@
 # Profiling runcore test supporting code
 #
 
-$(LIBRARY_DIR)/ProfTest.pbc: $(LIBRARY_DIR)/ProfTest/PIRProfile.pir \
-	$(LIBRARY_DIR)/ProfTest/Matcher.pir  $(LIBRARY_DIR)/ProfTest/Want.pir
-	$(PARROT) -o $@ $(LIBRARY_DIR)/ProfTest/PIRProfile.pir \
-		$(LIBRARY_DIR)/ProfTest/Matcher.pir $(LIBRARY_DIR)/ProfTest/Want.pir
+$(LIBRARY_DIR)/ProfTest.pbc: $(LIBRARY_DIR)/ProfTest/PIRProfile.pbc \
+	$(LIBRARY_DIR)/ProfTest/Matcher.pbc  $(LIBRARY_DIR)/ProfTest/Want.pbc
+	$(PBC_MERGE) -o $@ $(LIBRARY_DIR)/ProfTest/PIRProfile.pbc \
+		$(LIBRARY_DIR)/ProfTest/Matcher.pbc $(LIBRARY_DIR)/ProfTest/Want.pbc
+
+$(LIBRARY_DIR)/ProfTest/PIRProfile.pbc: $(LIBRARY_DIR)/ProfTest/PIRProfile.pir
+	$(PARROT) -o $@ $(LIBRARY_DIR)/ProfTest/PIRProfile.pir
 
 $(LIBRARY_DIR)/ProfTest/PIRProfile.pir: $(LIBRARY_DIR)/ProfTest/PIRProfile.nqp $(NQP_RX)
 	$(NQP_RX) --target=pir $(LIBRARY_DIR)/ProfTest/PIRProfile.nqp > $@
 
-$(LIBRARY_DIR)/ProfTest/Matcher.pir: $(LIBRARY_DIR)/ProfTest/Matcher.nqp $(NQP_RX)
-	$(NQP_RX) --target=pir $(LIBRARY_DIR)/ProfTest/Matcher.nqp > $@
+$(LIBRARY_DIR)/ProfTest/Want.pbc: $(LIBRARY_DIR)/ProfTest/Want.pir
+	$(PARROT) -o $@ $(LIBRARY_DIR)/ProfTest/Want.pir
 
 $(LIBRARY_DIR)/ProfTest/Want.pir: $(LIBRARY_DIR)/ProfTest/Want.nqp $(NQP_RX)
 	$(NQP_RX) --target=pir $(LIBRARY_DIR)/ProfTest/Want.nqp > $@
 
+$(LIBRARY_DIR)/ProfTest/Matcher.pbc: $(LIBRARY_DIR)/ProfTest/Matcher.pir
+	$(PARROT) -o $@ $(LIBRARY_DIR)/ProfTest/Matcher.pir
+
+$(LIBRARY_DIR)/ProfTest/Matcher.pir: $(LIBRARY_DIR)/ProfTest/Matcher.nqp $(NQP_RX)
+	$(NQP_RX) --target=pir $(LIBRARY_DIR)/ProfTest/Matcher.nqp > $@
+
+
 
 ###############################################################################
 #

Modified: branches/profiling_testing/t/profiling/profiling.t
==============================================================================
--- branches/profiling_testing/t/profiling/profiling.t	Sat Mar 27 23:56:28 2010	(r45217)
+++ branches/profiling_testing/t/profiling/profiling.t	Sat Mar 27 23:57:06 2010	(r45218)
@@ -23,6 +23,8 @@
     version
 );
 
+pir::exit(0);
+
 ok( $matcher.matches($prof), "profile has a version number");
 
 #Does the profile have a CLI invocation?