Index: test/wapptest.tcl
==================================================================
--- test/wapptest.tcl
+++ test/wapptest.tcl
@@ -220,10 +220,13 @@
     set keeplist {
       testfixture testfixture.exe
       sqlite3 sqlite3.exe
       test.log test-out.txt
       core
+      wapptest_make.sh
+      wapptest_configure.sh
+      wapptest_run.tcl
     }
     foreach f [glob -nocomplain [file join $G(test.$name.dir) *]] {
       set t [file tail $f]
       if {[lsearch $keeplist $t]<0} {
         catch { file delete -force $f }
@@ -275,19 +278,21 @@
     append res {
       set cfg  [readfile wapptest_configure.sh]
       set rc [catch { exec {*}$cfg >& test.log } msg]
       if {$rc==0} {
         set make [readfile wapptest_make.sh]
-        catch { exec {*}$make >>& test.log }
+        set rc [catch { exec {*}$make >>& test.log }]
       }
     } 
   } else { 
     append res {
       set make [readfile wapptest_make.sh]
-      catch { exec {*}$make >>& test.log }
+      set rc [catch { exec {*}$make >>& test.log }]
     }
   }
+
+  append res { exit $rc }
 
   set res
 }