Skip to content

Update test output again #269

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nomeata merged 4 commits into from
Mar 25, 2019
Merged

Update test output again #269

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a219bcd
Update test output again
nomeata Mar 25, 2019
8b7f514
Play around with Makefile stuff
nomeata Mar 25, 2019
1271b42
`dvm`: Make trap messages more informative
nomeata Mar 25, 2019
e5ae00c
Update test output again
nomeata Mar 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = "70d3b158611c96fe5e82b66d4a62c9d02bcd5345";
}; in
# Pass devel = true until the dev test suite runs on MacOS again
(import dev { devel = true; }).dvm
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/dvm.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/run-dfinity/ok/actor-reexport.dvm-run.ok
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
W, hypervisor: call failed with trap message: Uncaught RuntimeError: unreachable
W, hypervisor: calling start failed with trap message: Uncaught RuntimeError: unreachable
3 changes: 2 additions & 1 deletion test/run-dfinity/ok/array-out-of-bounds.dvm-run.ok
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
W, hypervisor: call failed with trap message: Uncaught RuntimeError: unreachable
W, hypervisor: calling func$92 failed with trap message: Uncaught RuntimeError: unreachable
W, hypervisor: calling func$98 failed with trap message: Uncaught RuntimeError: unreachable
1 change: 1 addition & 0 deletions test/run-dfinity/ok/counter-class.dvm-run.ok
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
W, hypervisor: calling start failed with trap message: Uncaught RuntimeError: unreachable
4 changes: 2 additions & 2 deletions test/run-dfinity/ok/overflow.dvm-run.ok
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
W, hypervisor: call failed with trap message: Uncaught RuntimeError: unreachable
W, hypervisor: call failed with trap message: Uncaught RuntimeError: unreachable
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.
Expand Down