Cleaned up bitrot in nsswitch testsuite. Merged tests across from TNG

branch.
(This used to be commit acef477383e5739292e764c17cef87822a09f13b)

1 files changed, 10 insertions, 5 deletions

diff --git a/testsuite/nsswitch/getpwuid.exp b/testsuite/nsswitch/getpwuid.exp
index 48e7dcb2be..be6a01cb9e 100644
--- a/testsuite/nsswitch/getpwuid.exp
+++ b/testsuite/nsswitch/getpwuid.exp
@@ -3,8 +3,6 @@
 #
 
 load_lib util-defs.exp
-load_lib "$srcdir/config/env.exp"
-load_lib "$srcdir/config/default-nt-names.exp"
 
 # Compile getpwuid.c
 
@@ -22,6 +20,8 @@ if {$output != ""} {
 set output [util_start "getent" "passwd" ""]
 set got_entries 0
 
+verbose $output
+
 foreach {line} [split $output "\n"] {
 
     # Process user
@@ -29,7 +29,7 @@ foreach {line} [split $output "\n"] {
     set pwd_entry [split $line ":"]
     set user [lindex $pwd_entry 0]
 
-    if {[regexp "^($domain)/" $user]} {
+    if {[regexp {^[^/]+/} $user]} {
 
         set got_entries 1
 
@@ -41,10 +41,15 @@ foreach {line} [split $output "\n"] {
         # Test lookup of uid succeeds
 
         set output [util_start "$srcdir/$subdir/getpwuid" "$uid" ""]
+
+	verbose $output
+
+	set test_desc "getpwuid $uid ($user)"
+
         if {[regexp "PASS:" $output]} {
-            pass "getpwuid $uid ($user)"
+            pass $test_desc
         } else {
-            fail "getpwuid $uid ($user)"
+            fail $test_desc
         }            
     }
 }