diff options
| -rw-r--r-- | Makefile | 22 | ||||
| -rw-r--r-- | src/report.zig | 2 | ||||
| -rw-r--r-- | test/apps/bun-init-check.sh | 26 |
3 files changed, 42 insertions, 8 deletions
@@ -223,7 +223,7 @@ STRIP=/usr/bin/strip endif ifeq ($(OS_NAME),linux) -STRIP=$(which llvm-strip || which llvm-strip-13 || echo "Missing strip") +STRIP=$(which llvm-strip || which llvm-strip-13 || which strip || echo "Missing strip") endif @@ -1006,12 +1006,20 @@ test-dev-bun-snapshot: touch test/bun.js/snapshots.debug.js $(foreach i,$(wildcard test/bun.js/*.snapshot.*),echo "" >> test/bun.js/snapshots.debug.js; echo "// $i" >> test/bun.js/snapshots.debug.js; $(DEBUG_BUN) build $i --platform=bun >> test/bun.js/snapshots.debug.js;) +.PHONY: test-bun-init +test-bun-init: + BUN_BIN=$(RELEASE_BUN) bash test/apps/bun-init-check.sh + +.PHONY: test-dev-bun-init +test-dev-bun-init: + BUN_BIN=$(DEBUG_BUN) bash test/apps/bun-init-check.sh + .PHONY: test-bun-wiptest test-bun-wiptest: test/wiptest/run cd test/wiptest && BUN_BIN=$(DEBUG_BUN) ./run ./fixtures .PHONY: test-all -test-all: test-install test-bun-snapshot test-with-hmr test-no-hmr test-create-next test-create-react test-bun-run test-bun-install test-bun-dev +test-all: test-install test-bun-snapshot test-with-hmr test-no-hmr test-create-next test-create-react test-bun-run test-bun-install test-bun-dev test-bun-init .PHONY: copy-test-node-modules copy-test-node-modules: @@ -1084,7 +1092,7 @@ test-dev-bun-run: cd test/apps && BUN_BIN=$(DEBUG_BUN) bash bun-run-check.sh .PHONY: test-dev-all -test-dev-all: test-install test-dev-bun-snapshot test-dev-with-hmr test-dev-no-hmr test-dev-create-next test-dev-create-react test-dev-bun-run test-dev-bun-install test-dev-bun-dev +test-dev-all: test-install test-dev-bun-snapshot test-dev-with-hmr test-dev-no-hmr test-dev-create-next test-dev-create-react test-dev-bun-run test-dev-bun-install test-dev-bun-dev test-dev-bun-init test-dev-bunjs: test-dev: test-dev-with-hmr @@ -1406,7 +1414,7 @@ $(OBJ_DIR): $(DEBUG_OBJ_DIR): mkdir -p $(DEBUG_OBJ_DIR) -$(OBJ_DIR)/%.o: $(SRC_DIR)/%.cpp $(OBJ_DIR) +$(OBJ_DIR)/%.o: $(SRC_DIR)/%.cpp $(CXX) $(CLANG_FLAGS) $(UWS_INCLUDE) \ $(MACOS_MIN_FLAG) \ $(OPTIMIZATION_LEVEL) \ @@ -1416,7 +1424,7 @@ $(OBJ_DIR)/%.o: $(SRC_DIR)/%.cpp $(OBJ_DIR) $(EMIT_LLVM) \ -g3 -c -o $@ $< -$(OBJ_DIR)/%.o: $(SRC_DIR)/webcore/%.cpp $(OBJ_DIR) +$(OBJ_DIR)/%.o: $(SRC_DIR)/webcore/%.cpp $(CXX) $(CLANG_FLAGS) \ $(MACOS_MIN_FLAG) \ $(OPTIMIZATION_LEVEL) \ @@ -1426,7 +1434,7 @@ $(OBJ_DIR)/%.o: $(SRC_DIR)/webcore/%.cpp $(OBJ_DIR) $(EMIT_LLVM) \ -g3 -c -o $@ $< -$(OBJ_DIR)/%.o: $(SRC_DIR)/sqlite/%.cpp $(OBJ_DIR) +$(OBJ_DIR)/%.o: $(SRC_DIR)/sqlite/%.cpp $(CXX) $(CLANG_FLAGS) \ $(MACOS_MIN_FLAG) \ $(OPTIMIZATION_LEVEL) \ @@ -1436,7 +1444,7 @@ $(OBJ_DIR)/%.o: $(SRC_DIR)/sqlite/%.cpp $(OBJ_DIR) $(EMIT_LLVM) \ -g3 -c -o $@ $< -$(OBJ_DIR)/%.o: src/bun.js/builtins/%.cpp $(OBJ_DIR) +$(OBJ_DIR)/%.o: src/bun.js/builtins/%.cpp $(CXX) $(CLANG_FLAGS) \ $(MACOS_MIN_FLAG) \ $(OPTIMIZATION_LEVEL) \ diff --git a/src/report.zig b/src/report.zig index d77c58247..11c49b181 100644 --- a/src/report.zig +++ b/src/report.zig @@ -237,7 +237,7 @@ pub fn fatal(err_: ?anyerror, msg_: ?string) void { } if (!had_printed_fatal) { - crash_report_writer.print("\nAsk for #help in https://bun.sh/discord or go to https://bun.sh/issues\n\n", .{}); + crash_report_writer.print("\nSearch GitHub issues https://bun.sh/issues or ask for #help in https://bun.sh/discord or\n\n", .{}); crash_report_writer.flush(); } } diff --git a/test/apps/bun-init-check.sh b/test/apps/bun-init-check.sh new file mode 100644 index 000000000..3eac65615 --- /dev/null +++ b/test/apps/bun-init-check.sh @@ -0,0 +1,26 @@ +#!/usr/bin/env bash + +# TODO: move this test to bun once we have a child_process equivalent. +(killall -9 $(basename $BUN_BIN) || echo "") >/dev/null 2>&1 + +rm -rf /tmp/bun-init-check +mkdir -p /tmp/bun-init-check + +cd /tmp/bun-init-check + +$BUN_BIN init -y + +if (($?)); then + echo "Bun init failed" + exit 1 +fi + +SHASUM_RESULT=$(cat index.ts .gitignore tsconfig.json package.json README.md | shasum) + +# This test will fail when the minor version of Bun changes. +if [[ "${SHASUM_RESULT}" != "b1548bb4e806f0506fd1b27ae8901d2e84926774 -" ]]; then + echo -e "Bun init shasum mismatch\n expected: b1548bb4e806f0506fd1b27ae8901d2e84926774\n actual: ${SHASUM_RESULT}" + exit 1 +fi + +exit 0 |