[profiling] use pbc_merge to build ProfTest.pbc

git-svn-id: https://svn.parrot.org/parrot/branches/profiling_testing@45218 d31e2699-5ff4-0310-a27c-f18f2fbe73fe
ashgti · Mar 27, 2010 · 5ae118f · 5ae118f
1 parent 289e8ff
commit 5ae118f
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 6 deletions.
diff --git a/config/gen/makefiles/root.in b/config/gen/makefiles/root.in
@@ -1046,20 +1046,30 @@ $(INSTALLABLEPBC_MERGE) : src/pbc_merge$(O) $(LIBPARROT) $(INSTALLABLECONFIG)
 # 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 > $@
+
+
 
 ###############################################################################
 #

diff --git a/t/profiling/profiling.t b/t/profiling/profiling.t
@@ -23,6 +23,8 @@ my $matcher := ProfTest::Matcher.new(
     version
 );
 
+pir::exit(0);
+
 ok( $matcher.matches($prof), "profile has a version number");
 
 #Does the profile have a CLI invocation?