From 5d05e072fd364fbb364a0fb91cd6554a6b326f79 Mon Sep 17 00:00:00 2001
From: Danny Auble <da@llnl.gov>
Date: Thu, 17 Jul 2008 19:23:34 +0000
Subject: [PATCH] updated strigger tests with better output

---
 testsuite/expect/test19.3 | 7 +++++--
 testsuite/expect/test19.4 | 7 +++++--
 testsuite/expect/test19.5 | 7 +++++--
 testsuite/expect/test19.6 | 7 +++++--
 testsuite/expect/test19.7 | 7 +++++--
 5 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/testsuite/expect/test19.3 b/testsuite/expect/test19.3
index 41b7007182f..eb5c7f2a65f 100755
--- a/testsuite/expect/test19.3
+++ b/testsuite/expect/test19.3
@@ -41,7 +41,7 @@ print_header $test_id
 #
 # get my uid and clear any vestigial triggers
 #
-set uid 0
+set uid -1
 spawn $bin_id -u
 expect {
 	-re "($number)" {
@@ -52,9 +52,12 @@ expect {
 		wait
 	}
 }
-if {$uid == 0} {
+if {$uid == -1} {
 	send_user "\nCan't get my uid\n"
 	exit 1
+} elseif {$uid == 0} {
+	send_user "\nWARNING: Can't run this test as user root\n"
+	exit 0
 }
 exec $strigger --clear --quiet --user=$uid
 
diff --git a/testsuite/expect/test19.4 b/testsuite/expect/test19.4
index 789e4a9aa67..cfe61d7adce 100755
--- a/testsuite/expect/test19.4
+++ b/testsuite/expect/test19.4
@@ -41,7 +41,7 @@ print_header $test_id
 #
 # get my uid and clear any vestigial triggers
 #
-set uid 0
+set uid -1
 spawn $bin_id -u
 expect {
 	-re "($number)" {
@@ -52,9 +52,12 @@ expect {
 		wait
 	}
 }
-if {$uid == 0} {
+if {$uid == -1} {
 	send_user "\nCan't get my uid\n"
 	exit 1
+} elseif {$uid == 0} {
+	send_user "\nWARNING: Can't run this test as user root\n"
+	exit 0
 }
 exec $strigger --clear --quiet --user=$uid
 
diff --git a/testsuite/expect/test19.5 b/testsuite/expect/test19.5
index 609541be045..39f40b68f43 100755
--- a/testsuite/expect/test19.5
+++ b/testsuite/expect/test19.5
@@ -44,7 +44,7 @@ print_header $test_id
 #
 # get my uid and clear any vestigial triggers
 #
-set uid 0
+set uid -1
 spawn $bin_id -u
 expect {
 	-re "($number)" {
@@ -55,9 +55,12 @@ expect {
 		wait
 	}
 }
-if {$uid == 0} {
+if {$uid == -1} {
 	send_user "\nCan't get my uid\n"
 	exit 1
+} elseif {$uid == 0} {
+	send_user "\nWARNING: Can't run this test as user root\n"
+	exit 0
 }
 exec $strigger --clear --quiet --user=$uid
 
diff --git a/testsuite/expect/test19.6 b/testsuite/expect/test19.6
index b2d17013b48..9e871ca97dd 100755
--- a/testsuite/expect/test19.6
+++ b/testsuite/expect/test19.6
@@ -45,7 +45,7 @@ print_header $test_id
 #
 # get my uid and clear any vestigial triggers
 #
-set uid 0
+set uid -1
 spawn $bin_id -u
 expect {
 	-re "($number)" {
@@ -56,9 +56,12 @@ expect {
 		wait
 	}
 }
-if {$uid == 0} {
+if {$uid == -1} {
 	send_user "\nCan't get my uid\n"
 	exit 1
+} elseif {$uid == 0} {
+	send_user "\nWARNING: Can't run this test as user root\n"
+	exit 0
 }
 exec $strigger --clear --quiet --user=$uid
 
diff --git a/testsuite/expect/test19.7 b/testsuite/expect/test19.7
index 8dd3ddee3c6..d4f80981495 100755
--- a/testsuite/expect/test19.7
+++ b/testsuite/expect/test19.7
@@ -42,7 +42,7 @@ print_header $test_id
 #
 # get my uid and clear any vestigial triggers
 #
-set uid 0
+set uid -1
 spawn $bin_id -u
 expect {
 	-re "($number)" {
@@ -53,9 +53,12 @@ expect {
 		wait
 	}
 }
-if {$uid == 0} {
+if {$uid == -1} {
 	send_user "\nCan't get my uid\n"
 	exit 1
+} elseif {$uid == 0} {
+	send_user "\nWARNING: Can't run this test as user root\n"
+	exit 0
 }
 exec $strigger --clear --quiet --user=$uid
 
-- 
GitLab