From a219bcd875e483962559cc75fbf10ac27e8659bd Mon Sep 17 00:00:00 2001
From: Joachim Breitner <mail@joachim-breitner.de>
Date: Mon, 25 Mar 2019 11:41:56 +0100
Subject: [PATCH 1/4] Update test output again
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

I am not entirely sure if there is nondeterminism, or if I simply
screwed up before. So let’s try again to set the output to what I
observe locally.
---
 test/run-dfinity/ok/counter-class.dvm-run.ok | 1 +
 test/run-dfinity/ok/overflow.dvm-run.ok      | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)
 create mode 100644 test/run-dfinity/ok/counter-class.dvm-run.ok

diff --git a/test/run-dfinity/ok/counter-class.dvm-run.ok b/test/run-dfinity/ok/counter-class.dvm-run.ok
new file mode 100644
index 00000000000..3292a97eddf
--- /dev/null
+++ b/test/run-dfinity/ok/counter-class.dvm-run.ok
@@ -0,0 +1 @@
+W, hypervisor: call failed with trap message: Uncaught RuntimeError: unreachable
diff --git a/test/run-dfinity/ok/overflow.dvm-run.ok b/test/run-dfinity/ok/overflow.dvm-run.ok
index 8ca337c71a9..901f242a784 100644
--- a/test/run-dfinity/ok/overflow.dvm-run.ok
+++ b/test/run-dfinity/ok/overflow.dvm-run.ok
@@ -1,5 +1,4 @@
 W, hypervisor: call failed with trap message: Uncaught RuntimeError: unreachable
-W, hypervisor: call failed with trap message: Uncaught RuntimeError: unreachable
 This is reachable.
 This is reachable.
 This is reachable.

From 8b7f5146f0ace4f4f1672acd8934ff2cdfa56be3 Mon Sep 17 00:00:00 2001
From: Joachim Breitner <mail@joachim-breitner.de>
Date: Mon, 25 Mar 2019 12:06:07 +0100
Subject: [PATCH 2/4] Play around with Makefile stuff

---
 test/Makefile | 2 +-
 test/dvm.sh   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/Makefile b/test/Makefile
index 693499a6eba..e8763d23934 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -3,7 +3,7 @@ all:
 	$(MAKE) -C run
 	$(MAKE) -C run-dfinity
 
-MAKE_PAR := $(MAKE) --no-print-directory --load-average -j $(shell getconf _NPROCESSORS_ONLN)
+MAKE_PAR := $(MAKE) --no-print-directory --load-average -j $(shell getconf _NPROCESSORS_ONLN) --keep-going
 
 quick:
 	$(MAKE_PAR) -C fail quick
diff --git a/test/dvm.sh b/test/dvm.sh
index 16037510060..7a1c8f6d372 100755
--- a/test/dvm.sh
+++ b/test/dvm.sh
@@ -7,7 +7,7 @@ then
 fi
 
 name="$(basename $1 .wasm)_0"
-DVM_TMP=$(mktemp -d)
+DVM_TMP=$(mktemp --directory --tmpdir dvm-XXXXXX)
 trap 'rm -rf $DVM_TMP' EXIT
 
 export LANG=C

From 1271b424415a452b28a414668c37d9a2644a406f Mon Sep 17 00:00:00 2001
From: Joachim Breitner <mail@joachim-breitner.de>
Date: Mon, 25 Mar 2019 12:29:36 +0100
Subject: [PATCH 3/4] `dvm`: Make trap messages more informative

---
 default.nix                                        | 14 ++++++++------
 test/run-dfinity/ok/actor-reexport.dvm-run.ok      |  2 +-
 test/run-dfinity/ok/array-out-of-bounds.dvm-run.ok |  2 +-
 test/run-dfinity/ok/counter-class.dvm-run.ok       |  2 +-
 test/run-dfinity/ok/overflow.dvm-run.ok            |  2 +-
 5 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/default.nix b/default.nix
index 3c381abd7f3..191714457e9 100644
--- a/default.nix
+++ b/default.nix
@@ -32,8 +32,8 @@ let real-dvm =
     then
       let dev = builtins.fetchGit {
         url = "ssh://git@github.com/dfinity-lab/dev";
-        rev = "0ce1f507cb3bb4fa8bba9223082a382fc9191f67";
-        ref = "master";
+        ref = "joachim/more-logging";
+        rev = "32f12e84792f13fa6bc7ff7d4aa76c2188bb2b1e";
       }; in
       # Pass devel = true until the dev test suite runs on MacOS again
       (import dev { devel = true; }).dvm
@@ -121,11 +121,13 @@ rec {
       asc --version
       make -C stdlib ASC=asc all
       make -C samples ASC=asc all
-      make -C test VERBOSE=1 ASC=asc quick
     '' +
-      (if test-dvm then ''
-      make --load-average -j8 -C test/run-dfinity VERBOSE=1 ASC=asc quick
-      '' else "");
+      (if test-dvm
+      then ''
+      make -C test ASC=asc parallel
+      '' else ''
+      make -C test ASC=asc quick
+      '');
 
     installPhase = ''
       mkdir -p $out
diff --git a/test/run-dfinity/ok/actor-reexport.dvm-run.ok b/test/run-dfinity/ok/actor-reexport.dvm-run.ok
index 3292a97eddf..86607643126 100644
--- a/test/run-dfinity/ok/actor-reexport.dvm-run.ok
+++ b/test/run-dfinity/ok/actor-reexport.dvm-run.ok
@@ -1 +1 @@
-W, hypervisor: call failed with trap message: Uncaught RuntimeError: unreachable
+W, hypervisor: calling start failed with trap message: Uncaught RuntimeError: unreachable
diff --git a/test/run-dfinity/ok/array-out-of-bounds.dvm-run.ok b/test/run-dfinity/ok/array-out-of-bounds.dvm-run.ok
index 3292a97eddf..a757a37b8f8 100644
--- a/test/run-dfinity/ok/array-out-of-bounds.dvm-run.ok
+++ b/test/run-dfinity/ok/array-out-of-bounds.dvm-run.ok
@@ -1 +1 @@
-W, hypervisor: call failed with trap message: Uncaught RuntimeError: unreachable
+W, hypervisor: calling func$92 failed with trap message: Uncaught RuntimeError: unreachable
diff --git a/test/run-dfinity/ok/counter-class.dvm-run.ok b/test/run-dfinity/ok/counter-class.dvm-run.ok
index 3292a97eddf..86607643126 100644
--- a/test/run-dfinity/ok/counter-class.dvm-run.ok
+++ b/test/run-dfinity/ok/counter-class.dvm-run.ok
@@ -1 +1 @@
-W, hypervisor: call failed with trap message: Uncaught RuntimeError: unreachable
+W, hypervisor: calling start failed with trap message: Uncaught RuntimeError: unreachable
diff --git a/test/run-dfinity/ok/overflow.dvm-run.ok b/test/run-dfinity/ok/overflow.dvm-run.ok
index 901f242a784..22dd86fcac4 100644
--- a/test/run-dfinity/ok/overflow.dvm-run.ok
+++ b/test/run-dfinity/ok/overflow.dvm-run.ok
@@ -1,4 +1,4 @@
-W, hypervisor: call failed with trap message: Uncaught RuntimeError: unreachable
+W, hypervisor: calling func$104 failed with trap message: Uncaught RuntimeError: unreachable
 This is reachable.
 This is reachable.
 This is reachable.

From e5ae00c2f8be42f71a46cb93afa1940d607051fe Mon Sep 17 00:00:00 2001
From: Joachim Breitner <mail@joachim-breitner.de>
Date: Mon, 25 Mar 2019 15:37:38 +0100
Subject: [PATCH 4/4] Update test output again

and pull in a version of `dev` where `dvm` flushes the log before
exiting.
---
 default.nix                                        | 2 +-
 test/run-dfinity/ok/array-out-of-bounds.dvm-run.ok | 1 +
 test/run-dfinity/ok/overflow.dvm-run.ok            | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/default.nix b/default.nix
index 191714457e9..d4c0723a70c 100644
--- a/default.nix
+++ b/default.nix
@@ -33,7 +33,7 @@ let real-dvm =
       let dev = builtins.fetchGit {
         url = "ssh://git@github.com/dfinity-lab/dev";
         ref = "joachim/more-logging";
-        rev = "32f12e84792f13fa6bc7ff7d4aa76c2188bb2b1e";
+        rev = "70d3b158611c96fe5e82b66d4a62c9d02bcd5345";
       }; in
       # Pass devel = true until the dev test suite runs on MacOS again
       (import dev { devel = true; }).dvm
diff --git a/test/run-dfinity/ok/array-out-of-bounds.dvm-run.ok b/test/run-dfinity/ok/array-out-of-bounds.dvm-run.ok
index a757a37b8f8..bc31b890000 100644
--- a/test/run-dfinity/ok/array-out-of-bounds.dvm-run.ok
+++ b/test/run-dfinity/ok/array-out-of-bounds.dvm-run.ok
@@ -1 +1,2 @@
 W, hypervisor: calling func$92 failed with trap message: Uncaught RuntimeError: unreachable
+W, hypervisor: calling func$98 failed with trap message: Uncaught RuntimeError: unreachable
diff --git a/test/run-dfinity/ok/overflow.dvm-run.ok b/test/run-dfinity/ok/overflow.dvm-run.ok
index 22dd86fcac4..95eb31c1554 100644
--- a/test/run-dfinity/ok/overflow.dvm-run.ok
+++ b/test/run-dfinity/ok/overflow.dvm-run.ok
@@ -1,4 +1,5 @@
 W, hypervisor: calling func$104 failed with trap message: Uncaught RuntimeError: unreachable
+W, hypervisor: calling func$110 failed with trap message: Uncaught RuntimeError: unreachable
 This is reachable.
 This is reachable.
 This is reachable.