citrun

commit fe9bb121a203618293ce26c0deaf3bb70c556efb
parent 8d16be74c74b1819ca93ab87deb925be1e90e02e
Author: Kyle Milz <kyle@0x30.net>
Date:   Sat,  6 Aug 2016 03:49:48 -0600

tt/ccitrunrun: use new binary names

Diffstat:
M
bin/openbsd/ccitrunrun/Makefile
 | 
6
++++++
M
tt/ccitrunrun.t
 | 
8
++++----

2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/bin/openbsd/ccitrunrun/Makefile b/bin/openbsd/ccitrunrun/Makefile
@@ -35,6 +35,12 @@ do-build:
 		-e "s,citrun_minor,ccitrunrun_minor,g" \
 		lib/runtime.h lib/runtime.c \
 		src/inst_action.cc src/inst_main.cc src/runtime.cc
+	cd ${WRKSRC} && sed -i \
+		-e "s,citrun-inst,ccitrunrun-inst," \
+		-e "s,citrun-term,ccitrunrun-term," \
+		-e "s,citrun-gl,ccitrunrun-gl," \
+		-e "s,libcitrun,libccitrunrun," \
+		Jamrules lib/runtime.c lib/Jamfile src/Jamfile src/inst_main.cc src/check.in
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} jam -j4
 
 do-test:
diff --git a/tt/ccitrunrun.t b/tt/ccitrunrun.t
@@ -13,7 +13,7 @@ my $viewer = Test::Viewer->new();
 
 system("citrun-check /usr/ports/pobj/ccitrunrun-*");
 
-my $exp = Expect->spawn("/usr/ports/pobj/ccitrunrun-*/citrun-*/src/citrun-gl");
+my $exp = Expect->spawn("/usr/ports/pobj/ccitrunrun-*/citrun-*/src/ccitrunrun-gl");
 $viewer->accept();
 $viewer->cmp_static_data([
 	# file name			lines	instrumented sites
@@ -38,7 +38,7 @@ $viewer->cmp_static_data([
 $exp->hard_close();
 $viewer->close();
 
-$exp = Expect->spawn("/usr/ports/pobj/ccitrunrun-*/citrun-*/src/citrun-term");
+$exp = Expect->spawn("/usr/ports/pobj/ccitrunrun-*/citrun-*/src/ccitrunrun-term");
 $viewer->accept();
 $viewer->cmp_static_data([
 	# file name		lines	instrumented sites
@@ -49,7 +49,7 @@ $viewer->cmp_static_data([
 $exp->hard_close();
 $viewer->close();
 
-$exp = Expect->spawn("/usr/ports/pobj/ccitrunrun-*/citrun-*/src/citrun-inst");
+$exp = Expect->spawn("/usr/ports/pobj/ccitrunrun-*/citrun-*/src/ccitrunrun-inst");
 $viewer->accept();
 
 $viewer->cmp_static_data([
@@ -60,4 +60,4 @@ $viewer->cmp_static_data([
 ]);
 
 $exp->hard_close();
-$package->clean();
+#$package->clean();