From c6c5de9d45b2e09c498c66bbc0772855d237ee56 Mon Sep 17 00:00:00 2001
From: Jonathan Lebon <jlebon@redhat.com>
Date: Fri, 7 Feb 2014 10:46:59 -0500
Subject: [PATCH] color_parsing.exp: adjust installtest check

---
 testsuite/systemtap.base/color_parsing.exp | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/testsuite/systemtap.base/color_parsing.exp b/testsuite/systemtap.base/color_parsing.exp
index ed88feefe..a59c27821 100644
--- a/testsuite/systemtap.base/color_parsing.exp
+++ b/testsuite/systemtap.base/color_parsing.exp
@@ -14,8 +14,6 @@ proc checker { TEST EXE EXP } {
 		set STR "parse error:"
 	} else {
 		set cmd "staprun -C always"
-		# build-tree staprun is not in $PATH
-		if {![installtest_p]} then { untested $test; return }
 		set STR "ERROR:"
 	}
 
@@ -72,9 +70,15 @@ proc stap_check_parse { TEST ENV EXP } {
 	set env(SYSTEMTAP_COLORS) "$ENV"
 	verbose -log "SYSTEMTAP_COLORS set to \"$env(SYSTEMTAP_COLORS)\""
 
-	# Test stap and staprun
-	checker "$TEST" "stap"    "$EXP"
-	checker "$TEST" "staprun" "$EXP"
+	# Test stap
+	checker "$TEST" "stap" "$EXP"
+
+	# Test staprun if installcheck
+	if {[installtest_p]} {
+		checker "$TEST" "staprun" "$EXP"
+	} else {
+		untested "$test ($TEST - staprun)"
+	}
 }
 
 stap_check_parse "empty"	"" ""
-- 
2.43.5