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

branch.

1 files changed, 11 insertions, 12 deletions

diff --git a/testsuite/nsswitch/getpwnam.exp b/testsuite/nsswitch/getpwnam.exp
index 49f61f1a5cc..5f6b2343392 100644
--- a/testsuite/nsswitch/getpwnam.exp
+++ b/testsuite/nsswitch/getpwnam.exp
@@ -1,26 +1,25 @@
 #
-# @(#) Test default domain users resolve using getpwnam()
+# @(#) Test domain users resolve using getpwnam()
 #
 
 load_lib util-defs.exp
-load_lib "$srcdir/config/env.exp"
-load_lib "$srcdir/config/default-nt-names.exp"
+load_lib "compile.exp"
 
 # Compile getpwnam.c
 
-set output [target_compile "$srcdir/$subdir/getpwnam.c" \
-        "$srcdir/$subdir/getpwnam" executable {additional_flags="-g"}]
-
-if {$output != ""} {
-    perror "compile getpwnam"
-    puts $output
-    return
-}
+simple_compile "getpwnam"
 
 # Test domain users
 
-foreach {user} $domain_users {
+set user_list [split [util_start "bin/wbinfo" "-u"] "\n"]
+
+verbose $user_list
+
+foreach { user } $user_list {
     set output [util_start "$srcdir/$subdir/getpwnam" "\"$user\"" ""]
+
+    verbose $output
+
     if {[regexp "PASS:" $output]} {
         pass "getpwnam $user"
     } else {