Skip to content

Commit 75c68ea

Browse files
kateinoigakukunkateinoigakukun
committed
Rename directory
1 parent c3b9de8 commit 75c68ea

6 files changed

Lines changed: 13 additions & 14 deletions

File tree

‎IntegrationTests/Makefile‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,18 @@
1-
MAKEFILE_DIR := $(dir $(lastword $(MAKEFILE_LIST)))
21
CONFIGURATION ?= debug
32

4-
.PHONY: JavaScriptKitExec
5-
JavaScriptKitExec:
6-
cd JavaScriptKitExec && \
7-
swift build --triple wasm32-unknown-wasi \
8-
--configuration $(CONFIGURATION)
3+
.PHONY: TestSuites/.build/$(CONFIGURATION)/TestSuites
4+
TestSuites/.build/$(CONFIGURATION)/TestSuites:
5+
swift build --package-path TestSuites \
6+
--triple wasm32-unknown-wasi \
7+
--configuration $(CONFIGURATION)
98

10-
dist/JavaScriptKitExec.wasm: JavaScriptKitExec
9+
dist/TestSuites.wasm: TestSuites/.build/$(CONFIGURATION)/TestSuites
1110
mkdir -p dist
12-
cp ./JavaScriptKitExec/.build/$(CONFIGURATION)/JavaScriptKitExec $@
11+
cp $< $@
1312

14-
node_modules:
13+
node_modules: package-lock.json
1514
npm install
16-
build: node_modules dist/JavaScriptKitExec.wasm
15+
build: node_modules dist/TestSuites.wasm
1716
cd ../Runtime && npm run build
1817
test: build
1918
node index.js

IntegrationTests/JavaScriptKitExec/.gitignore renamed to IntegrationTests/TestSuites/.gitignore

File renamed without changes.

IntegrationTests/JavaScriptKitExec/Package.swift renamed to IntegrationTests/TestSuites/Package.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
import PackageDescription
44

55
let package = Package(
6-
name: "JavaScriptKitExec",
6+
name: "TestSuites",
77
products: [
88
.executable(
9-
name: "JavaScriptKitExec", targets: ["JavaScriptKitExec"]
9+
name: "TestSuites", targets: ["TestSuites"]
1010
),
1111
],
1212
dependencies: [.package(name: "JavaScriptKit", path: "../../")],
13-
targets: [.target(name: "JavaScriptKitExec", dependencies: ["JavaScriptKit"])]
13+
targets: [.target(name: "TestSuites", dependencies: ["JavaScriptKit"])]
1414
)

IntegrationTests/JavaScriptKitExec/Sources/JavaScriptKitExec/UnitTestUtils.swift renamed to IntegrationTests/TestSuites/Sources/TestSuites/UnitTestUtils.swift

File renamed without changes.

IntegrationTests/JavaScriptKitExec/Sources/JavaScriptKitExec/main.swift renamed to IntegrationTests/TestSuites/Sources/TestSuites/main.swift

File renamed without changes.

‎IntegrationTests/index.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ global.Animal = function(name, age, isCat) {
7373

7474
const startWasiTask = async () => {
7575
// Fetch our Wasm File
76-
const wasmBinary = await readFile("./dist/JavaScriptKitExec.wasm");
76+
const wasmBinary = await readFile("./dist/TestSuites.wasm");
7777

7878
// Instantiate the WebAssembly file
7979
let { instance } = await WebAssembly.instantiate(wasmBinary, {

0 commit comments

Comments
 (0)