diff options
author | 2021-09-17 15:01:28 -0700 | |
---|---|---|
committer | 2021-09-17 15:01:28 -0700 | |
commit | c20b5414c4778949f292bcd800cebf6f43ab10e0 (patch) | |
tree | 71244db80a20b189240c061406c1a3713e41b77b | |
parent | 1a0438b3b13606160056ec2423bfa55eeecf69d9 (diff) | |
download | bun-c20b5414c4778949f292bcd800cebf6f43ab10e0.tar.gz bun-c20b5414c4778949f292bcd800cebf6f43ab10e0.tar.zst bun-c20b5414c4778949f292bcd800cebf6f43ab10e0.zip |
Fix test makefile
-rw-r--r-- | Makefile | 10 | ||||
-rw-r--r-- | integration/snapshots/bundled-entry-point.js | 2 | ||||
-rw-r--r-- | integration/snapshots/export.js | 2 | ||||
-rw-r--r-- | integration/snapshots/global-is-remapped-to-globalThis.js | 2 | ||||
-rw-r--r-- | integration/snapshots/multiple-imports.js | 2 | ||||
-rw-r--r-- | integration/snapshots/type-only-imports.ts | 2 |
6 files changed, 11 insertions, 9 deletions
@@ -7,7 +7,7 @@ TRIPLET := $(OS_NAME)-$(ARCH_NAME) PACKAGE_DIR := packages/bun-cli-$(TRIPLET) DEBUG_PACKAGE_DIR := packages/debug-bun-cli-$(TRIPLET) BIN_DIR := $(PACKAGE_DIR)/bin -RELEASE_BUN := $(BIN_DIR)/bun +RELEASE_BUN := $(shell realpath $(PACKAGE_DIR)/bin/bun) DEBUG_BIN := $(DEBUG_PACKAGE_DIR)/bin DEBUG_BIN_REALPATH := $(shell realpath $(DEBUG_PACKAGE_DIR)/bin) DEBUG_BUN := $(shell realpath $(DEBUG_BIN)/bun-debug) @@ -112,12 +112,14 @@ test-install: cd integration/scripts && npm install test-all: test-install test-with-hmr test-no-hmr + +kill-bun: + -killall -9 bun bun-debug -test-with-hmr: - -killall bun -9; +test-with-hmr: kill-bun BUN_BIN=$(RELEASE_BUN) node integration/scripts/browser.js -test-no-hmr: +test-no-hmr: kill-bun -killall bun -9; DISABLE_HMR="DISABLE_HMR" BUN_BIN=$(RELEASE_BUN) node integration/scripts/browser.js diff --git a/integration/snapshots/bundled-entry-point.js b/integration/snapshots/bundled-entry-point.js index fd211daa2..f3008327a 100644 --- a/integration/snapshots/bundled-entry-point.js +++ b/integration/snapshots/bundled-entry-point.js @@ -8,7 +8,7 @@ import { __HMRClient as Bun } from "http://localhost:8080/__runtime.js"; import * as $bbcd215f from "http://localhost:8080/node_modules/react/index.js"; -Bun.activate(true); +Bun.activate(false); var hmr = new HMR(3012834585, "bundled-entry-point.js"), exports = hmr.exports; (hmr._load = function() { diff --git a/integration/snapshots/export.js b/integration/snapshots/export.js index b5d3e0ad1..6088ffd77 100644 --- a/integration/snapshots/export.js +++ b/integration/snapshots/export.js @@ -6,7 +6,7 @@ __HMRClient as Bun } from "http://localhost:8080/__runtime.js"; import what from "http://localhost:8080/_auth.js"; import * as where from "http://localhost:8080/_auth.js"; -Bun.activate(true); +Bun.activate(false); var hmr = new HMR(1879780259, "export.js"), exports = hmr.exports; (hmr._load = function() { diff --git a/integration/snapshots/global-is-remapped-to-globalThis.js b/integration/snapshots/global-is-remapped-to-globalThis.js index dace8fa7a..a5a3723a6 100644 --- a/integration/snapshots/global-is-remapped-to-globalThis.js +++ b/integration/snapshots/global-is-remapped-to-globalThis.js @@ -4,7 +4,7 @@ __HMRModule as HMR import { __HMRClient as Bun } from "http://localhost:8080/__runtime.js"; -Bun.activate(true); +Bun.activate(false); var hmr = new HMR(713665787, "global-is-remapped-to-globalThis.js"), exports = hmr.exports; (hmr._load = function() { diff --git a/integration/snapshots/multiple-imports.js b/integration/snapshots/multiple-imports.js index 048988d09..727907e62 100644 --- a/integration/snapshots/multiple-imports.js +++ b/integration/snapshots/multiple-imports.js @@ -14,7 +14,7 @@ var jsx = require(JSX).jsxDEV, fileName = "multiple-imports.js", JSXFrag = requi var { default: React} = require($bbcd215f); var { default: React2} = require($bbcd215f); -Bun.activate(true); +Bun.activate(false); var hmr = new HMR(2165509932, "multiple-imports.js"), exports = hmr.exports; (hmr._load = function() { diff --git a/integration/snapshots/type-only-imports.ts b/integration/snapshots/type-only-imports.ts index c647843ea..84740d0d9 100644 --- a/integration/snapshots/type-only-imports.ts +++ b/integration/snapshots/type-only-imports.ts @@ -4,7 +4,7 @@ __HMRModule as HMR import { __HMRClient as Bun } from "http://localhost:8080/__runtime.js"; -Bun.activate(true); +Bun.activate(false); var hmr = new HMR(650094581, "type-only-imports.ts"), exports = hmr.exports; (hmr._load = function() { |