Small cleanup of context.exp.

* testsuite/systemtap.context/context.exp: Used "make -C $build_dir" to
  avoid using 'cd'.  Added error handling.

1 files changed, 18 insertions, 15 deletions

diff --git a/testsuite/systemtap.context/context.exp b/testsuite/systemtap.context/context.exp
index da9910b6..46b24a2c 100644
--- a/testsuite/systemtap.context/context.exp
+++ b/testsuite/systemtap.context/context.exp
@@ -16,48 +16,51 @@ proc cleanup {} {
 	as_root  [list /bin/rm -f /lib/modules/$::uname/kernel/systemtap_test_module$n.ko]
 	as_root [list /sbin/rmmod systemtap_test_module$n]
     }
-    if {$build_dir != ""} {exec rm -rf $build_dir}
+    if {$build_dir != ""} {
+	catch { exec rm -rf $build_dir }
+    }
 }
 
 proc build_modules {} {
     global build_dir
     global srcdir subdir
 
+    # Create the build directory and populate it
     if {[catch {exec mktemp -d staptestXXXXXX} build_dir]} {
 	verbose -log "Failed to create temporary directory: $build_dir"
 	return 0
     }
-
     foreach f [glob $srcdir/$subdir/systemtap_test_module*.c] {
-	exec cp $f $build_dir
+	exec cp $f $build_dir/
     }
-    set old_dir [pwd]
-    cd $build_dir
 
+    # Build the modules
     foreach n {2 1} {
-	exec cp -p $srcdir/$subdir/makefile$n Makefile
-	if {[catch {exec make clean} res]} {
+	exec cp -p $srcdir/$subdir/makefile$n $build_dir/Makefile
+	if {[catch {exec make -C $build_dir clean} res]} {
 	    verbose -log "$res"
-	    cd $old_dir
 	    return 0
 	}
-	catch {exec make} res
-	if {![file exists systemtap_test_module$n.ko]} {
+	catch {exec make -C $build_dir} res
+	if {![file exists $build_dir/systemtap_test_module$n.ko]} {
 	    verbose -log "$res"
-	    cd $old_dir
 	    return 0
 	}
-	set res [as_root  [list cp systemtap_test_module$n.ko /lib/modules/$::uname/kernel]]
+	set res [as_root  [list cp $build_dir/systemtap_test_module$n.ko /lib/modules/$::uname/kernel]]
 	if { $res != 0 } {
 	    verbose -log "$res"
-	    cd $old_dir
 	    return 0
 	}
     }
+
+    # Install the modules
     foreach n {2 1} {
-	as_root [list /sbin/insmod systemtap_test_module$n.ko]
+	set res [as_root [list /sbin/insmod $build_dir/systemtap_test_module$n.ko]]
+	if {$res != 0} {
+	    verbose -log "$res"
+	    return 0
+	}
     }
-    cd $old_dir
     return 1
 }