Fix the expectations for test 007 to match the RI's output.

Also distinguish between building and running in run-test.

Change-Id: I4ca1a8b86839995959dd86b341086eb962e6f094
diff --git a/test/007-exceptions/expected.txt b/test/007-exceptions/expected.txt
index 6b6d7d0..982c777 100644
--- a/test/007-exceptions/expected.txt
+++ b/test/007-exceptions/expected.txt
@@ -1,8 +1,8 @@
 Got an NPE: second throw
 java.lang.NullPointerException: second throw
-	at Main.catchAndRethrow(Main.java:165)
-	at Main.main(Main.java:29)
+	at Main.catchAndRethrow(Main.java:36)
+	at Main.main(Main.java:23)
 Caused by: java.lang.NullPointerException: first throw
 	at Main.throwNullPointerException(Main.java:43)
-	at Main.catchAndRethrow(Main.java:40)
+	at Main.catchAndRethrow(Main.java:33)
 	... 1 more
diff --git a/test/run-test b/test/run-test
index 4132a9d..6c51699 100755
--- a/test/run-test
+++ b/test/run-test
@@ -179,7 +179,7 @@
 
 # copy the test to a temp dir and run it
 
-echo "${test_dir}: running..." 1>&2
+echo "${test_dir}: building..." 1>&2
 
 rm -rf "$tmp_dir"
 cp -Rp "$test_dir" "$tmp_dir"
@@ -189,6 +189,8 @@
     cp "${progdir}/etc/default-build" build
 fi
 
+echo "${test_dir}: running..." 1>&2
+
 if [ '!' -r "$run" ]; then
     cp "${progdir}/etc/default-run" run
 fi