diff --git a/tests/api/clean-shutdown.js b/tests/api/clean-shutdown.js index 77e458e6..4fa59b9f 100755 --- a/tests/api/clean-shutdown.js +++ b/tests/api/clean-shutdown.js @@ -4,8 +4,10 @@ // This test checks that calling emulator.stop() will remove all event // listeners, so that the nodejs process cleanly and automatically exits. +const TEST_RELEASE_BUILD = +process.env.TEST_RELEASE_BUILD; + const fs = require("fs"); -const V86 = require("../../build/libv86-debug.js").V86; +var V86 = require(`../../build/${TEST_RELEASE_BUILD ? "libv86" : "libv86-debug"}.js`).V86; process.on("unhandledRejection", exn => { throw exn; }); diff --git a/tests/api/state.js b/tests/api/state.js index 014648e4..a2c4a2db 100755 --- a/tests/api/state.js +++ b/tests/api/state.js @@ -3,7 +3,9 @@ process.on("unhandledRejection", exn => { throw exn; }); -var V86 = require("../../build/libv86-debug.js").V86; +const TEST_RELEASE_BUILD = +process.env.TEST_RELEASE_BUILD; + +var V86 = require(`../../build/${TEST_RELEASE_BUILD ? "libv86" : "libv86-debug"}.js`).V86; var fs = require("fs"); const config_async_cdrom = { diff --git a/tests/devices/virtio_9p.js b/tests/devices/virtio_9p.js index 863ea244..12d58e8d 100755 --- a/tests/devices/virtio_9p.js +++ b/tests/devices/virtio_9p.js @@ -2,7 +2,10 @@ "use strict"; process.on("unhandledRejection", exn => { throw exn; }); -const V86 = require("../../build/libv86-debug.js").V86; + +const TEST_RELEASE_BUILD = +process.env.TEST_RELEASE_BUILD; + +var V86 = require(`../../build/${TEST_RELEASE_BUILD ? "libv86" : "libv86-debug"}.js`).V86; const fs = require("fs"); const testfsjson = require("./testfs.json"); diff --git a/tests/expect/run.js b/tests/expect/run.js index aba1713d..53ac0cc0 100755 --- a/tests/expect/run.js +++ b/tests/expect/run.js @@ -1,15 +1,16 @@ #!/usr/bin/env node "use strict"; +const TEST_RELEASE_BUILD = +process.env.TEST_RELEASE_BUILD; + const fs = require("fs"); const path = require("path"); -const process = require("process"); const { spawnSync } = require("child_process"); const libwabt = require("../../build/libwabt.js"); try { - var V86 = require("../../build/libv86-debug.js").V86; + var V86 = require(`../../build/${TEST_RELEASE_BUILD ? "libv86" : "libv86-debug"}.js`).V86; } catch(e) { console.error(e); diff --git a/tests/full/run.js b/tests/full/run.js index d20eaf2f..50494757 100755 --- a/tests/full/run.js +++ b/tests/full/run.js @@ -6,13 +6,14 @@ process.on("unhandledRejection", exn => { throw exn; }); var TIMEOUT_EXTRA_FACTOR = +process.env.TIMEOUT_EXTRA_FACTOR || 1; var MAX_PARALLEL_TESTS = +process.env.MAX_PARALLEL_TESTS || 4; var TEST_NAME = process.env.TEST_NAME; +const TEST_RELEASE_BUILD = +process.env.TEST_RELEASE_BUILD; const VERBOSE = false; const RUN_SLOW_TESTS = false; try { - var V86 = require("../../build/libv86-debug.js").V86; + var V86 = require(`../../build/${TEST_RELEASE_BUILD ? "libv86" : "libv86-debug"}.js`).V86; } catch(e) { diff --git a/tests/jit-paging/run.js b/tests/jit-paging/run.js index ed045a64..b14d0c06 100755 --- a/tests/jit-paging/run.js +++ b/tests/jit-paging/run.js @@ -3,7 +3,9 @@ process.on("unhandledRejection", exn => { throw exn; }); -var V86 = require("../../build/libv86-debug.js").V86; +const TEST_RELEASE_BUILD = +process.env.TEST_RELEASE_BUILD; + +var V86 = require(`../../build/${TEST_RELEASE_BUILD ? "libv86" : "libv86-debug"}.js`).V86; var fs = require("fs"); var test_executable = new Uint8Array(fs.readFileSync(__dirname + "/test-jit")); diff --git a/tests/kvm-unit-tests/run.js b/tests/kvm-unit-tests/run.js index a7441afa..bf38be2a 100755 --- a/tests/kvm-unit-tests/run.js +++ b/tests/kvm-unit-tests/run.js @@ -3,7 +3,9 @@ process.on("unhandledRejection", exn => { throw exn; }); -var V86 = require("../../build/libv86-debug.js").V86; +const TEST_RELEASE_BUILD = +process.env.TEST_RELEASE_BUILD; + +var V86 = require(`../../build/${TEST_RELEASE_BUILD ? "libv86" : "libv86-debug"}.js`).V86; var fs = require("fs"); function readfile(path) diff --git a/tests/nasm/run.js b/tests/nasm/run.js index 4bd78de0..c16b127d 100755 --- a/tests/nasm/run.js +++ b/tests/nasm/run.js @@ -23,6 +23,7 @@ const cluster = require("cluster"); const MAX_PARALLEL_TESTS = +process.env.MAX_PARALLEL_TESTS || 99; const TEST_NAME = process.env.TEST_NAME; const SINGLE_TEST_TIMEOUT = 10000; +const TEST_RELEASE_BUILD = +process.env.TEST_RELEASE_BUILD; const TEST_DIR = __dirname + "/build/"; const DONE_MSG = "DONE"; @@ -33,7 +34,7 @@ const FORCE_JIT = process.argv.includes("--force-jit"); const MASK_ARITH = 1 | 1 << 2 | 1 << 4 | 1 << 6 | 1 << 7 | 1 << 11; try { - var V86 = require("../../build/libv86-debug.js").V86; + var V86 = require(`../../build/${TEST_RELEASE_BUILD ? "libv86" : "libv86-debug"}.js`).V86; } catch(e) { console.error(e); diff --git a/tests/qemu/run.js b/tests/qemu/run.js index 19a2f3d6..838153b0 100755 --- a/tests/qemu/run.js +++ b/tests/qemu/run.js @@ -3,7 +3,9 @@ process.on("unhandledRejection", exn => { throw exn; }); -var V86 = require("../../build/libv86-debug.js").V86; +const TEST_RELEASE_BUILD = +process.env.TEST_RELEASE_BUILD; + +var V86 = require(`../../build/${TEST_RELEASE_BUILD ? "libv86" : "libv86-debug"}.js`).V86; var fs = require("fs"); var test_executable = new Uint8Array(fs.readFileSync(__dirname + "/test-i386"));