Make test fixtures self-contained

holepunchto · Feb 18, 2024 · 47f000d · 47f000d
1 parent 705cc15
commit 47f000d
Show file tree

Hide file tree

Showing 14 changed files with 29 additions and 36 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -35,7 +35,7 @@ jobs:
     - uses: actions/setup-node@v4
       with:
         node-version: ${{ matrix.node }}
-    - run: npm install -g bare-runtime bare-dev
+    - run: npm install -g bare-dev
     - run: bare-dev configure --debug --platform ${{ matrix.platform }} --arch ${{ matrix.arch }}
     - run: bare-dev build --debug
     - run: bare-dev test --debug
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -26,8 +26,6 @@ list(APPEND tests
   timeout-clear.js
 )
 
-add_subdirectory(fixtures)
-
 foreach(file IN LISTS tests)
   get_filename_component(name ${file} NAME_WE)
 

diff --git a/test/fixtures/CMakeLists.txt b/test/fixtures/CMakeLists.txt
diff --git a/test/fixtures/addon/.gitignore b/test/fixtures/addon/.gitignore
@@ -0,0 +1 @@
+!prebuilds
diff --git a/test/fixtures/addon/prebuilds/darwin-arm64/addon.bare b/test/fixtures/addon/prebuilds/darwin-arm64/addon.bare
diff --git a/test/fixtures/addon/prebuilds/darwin-x64/addon.bare b/test/fixtures/addon/prebuilds/darwin-x64/addon.bare
diff --git a/test/fixtures/addon/prebuilds/linux-arm64/addon.bare b/test/fixtures/addon/prebuilds/linux-arm64/addon.bare
diff --git a/test/fixtures/addon/prebuilds/linux-x64/addon.bare b/test/fixtures/addon/prebuilds/linux-x64/addon.bare
diff --git a/test/fixtures/addon/prebuilds/win32-arm64/addon.bare b/test/fixtures/addon/prebuilds/win32-arm64/addon.bare
diff --git a/test/fixtures/addon/prebuilds/win32-x64/addon.bare b/test/fixtures/addon/prebuilds/win32-x64/addon.bare
diff --git a/test/fixtures/bundle/.gitignore b/test/fixtures/bundle/.gitignore
@@ -0,0 +1 @@
+!*.bundle
diff --git a/test/fixtures/bundle/CMakeLists.txt b/test/fixtures/bundle/CMakeLists.txt
diff --git a/test/fixtures/bundle/mod.bundle b/test/fixtures/bundle/mod.bundle
@@ -0,0 +1,25 @@
+291
+{
+  "version": 0,
+  "main": "/mod.js",
+  "imports": {},
+  "resolutions": {
+    "/mod.js": {
+      "bare:package": "/package.json"
+    }
+  },
+  "files": {
+    "/mod.js": {
+      "offset": 0,
+      "length": 37
+    },
+    "/package.json": {
+      "offset": 37,
+      "length": 23
+    }
+  }
+}
+module.exports = 'Hello from bundle'
+{
+  "name": "bundle"
+}
diff --git a/test/fixtures/bundle/package.json b/test/fixtures/bundle/package.json
@@ -1,3 +1,3 @@
 {
-	"name": "bundle"
+  "name": "bundle"
 }