Add more tests for asconfig (#1412)

Willem Wyndham · web-flow · commit c8a150c11671 · 2020-07-25T09:02:35.000+02:00
diff --git a/tests/asconfig/.gitignore b/tests/asconfig/.gitignore
@@ -0,0 +1 @@
+!entry-points/**/*/node_modules/
diff --git a/tests/asconfig/complicated/assembly/index.ts b/tests/asconfig/complicated/assembly/index.ts
@@ -1,6 +1,6 @@
-assert(ASC_OPTIMIZE_LEVEL == 3);
-assert(ASC_SHRINK_LEVEL == 1);
-assert(ASC_FEATURE_SIMD);
+assert(ASC_OPTIMIZE_LEVEL == 3, "expected optimize level == 3");
+assert(ASC_SHRINK_LEVEL == 1, "expected shrink level == 1");
+assert(ASC_FEATURE_SIMD, "expected SIMD enabled");
 let size = memory.size();
 trace("size", 1, size);
-assert(size == 30);
+assert(size == 30, "expected 30 got " + size.toString());
diff --git a/tests/asconfig/entry-points/node-resolution/asconfig.json b/tests/asconfig/entry-points/node-resolution/asconfig.json
@@ -0,0 +1,3 @@
+{
+  "extends": "entry-points/asconfig.json"
+}
diff --git a/tests/asconfig/entry-points/node-resolution/assembly/index.ts b/tests/asconfig/entry-points/node-resolution/assembly/index.ts
@@ -0,0 +1 @@
+assert(answerToLife == 42);
diff --git a/tests/asconfig/entry-points/node-resolution/node_modules/entry-points/asconfig.json b/tests/asconfig/entry-points/node-resolution/node_modules/entry-points/asconfig.json
diff --git a/tests/asconfig/entry-points/node-resolution/node_modules/entry-points/assembly/globals.ts b/tests/asconfig/entry-points/node-resolution/node_modules/entry-points/assembly/globals.ts
diff --git a/tests/asconfig/entry-points/node-resolution/node_modules/entry-points/assembly/index.ts b/tests/asconfig/entry-points/node-resolution/node_modules/entry-points/assembly/index.ts
diff --git a/tests/asconfig/entry-points/node-resolution/package.json b/tests/asconfig/entry-points/node-resolution/package.json
@@ -0,0 +1,6 @@
+{
+  "private": true,
+  "scripts": {
+    "test": "node ../../index.js"
+  }
+}
diff --git a/tests/asconfig/entry-points/package.json b/tests/asconfig/entry-points/package.json
@@ -1,6 +1,8 @@
 {
   "private": true,
   "scripts": {
-    "test": "node ../index.js && cd nested && npm run test"
+    "test": "node ../index.js && npm run test:nested && npm run test:node",
+    "test:nested": "cd nested && npm run test",
+    "test:node": "cd node-resolution && npm run test"
   }
 }
diff --git a/tests/asconfig/extends/asconfig.json b/tests/asconfig/extends/asconfig.json
@@ -5,7 +5,9 @@
     }
   },
   "options": {
-    "enable": ["simd"]
+    "enable": ["simd"],
+    "runtime": "half",
+    "noEmit": false
   },
   "extends": "./extends.json"
 }
diff --git a/tests/asconfig/extends/expected.json b/tests/asconfig/extends/expected.json
@@ -0,0 +1,8 @@
+{
+  "options": {
+    "runtime": "half",
+    "noEmit": false,
+    "noAssert": true,
+    "enable": ["simd"]
+  }
+}
diff --git a/tests/asconfig/extends/extends.json b/tests/asconfig/extends/extends.json
@@ -6,6 +6,8 @@
     }
   },
   "options": {
-    "disable": ["simd"]
+    "disable": ["simd"],
+    "noEmit": true,
+    "noAssert": true
   }
 }
diff --git a/tests/asconfig/extends/package.json b/tests/asconfig/extends/package.json
@@ -1,6 +1,6 @@
 {
   "private": true,
   "scripts": {
-    "test": "node ../index.js"
+    "test": "node ../index.js --showConfig && node ../index.js"
   }
 }
diff --git a/tests/asconfig/index.js b/tests/asconfig/index.js
@@ -1,7 +1,11 @@
 const asc = require("../../cli/asc");
 const loader = require("../../lib/loader");
 const args = process.argv.slice(2);
+const path = require('path');
+const fs = require("fs");
 
+/** @type {string} */
+let stderr;
 /** @type {Uint8Array} */
 let binary;
 asc.main(["assembly/index.ts", "--outFile", "output.wasm", "--explicitStart", ...args], {
@@ -11,13 +15,52 @@ asc.main(["assembly/index.ts", "--outFile", "output.wasm", "--explicitStart", ..
     } else if (name !== "output.wasm.map") {
       throw Error("Unexpected output file: " + name);
     }
+  },
+  stderr: {
+    write(s) {
+      stderr = s;
+    }
   }
+
 }, (err) => {
   if (err) {
     console.error(err);
+    console.error(stderr);
     process.exit(1);
   }
 
+  const jsonPath = path.join(process.cwd(), "expected.json");
+  if (fs.existsSync(jsonPath) && stderr) {
+    const actualRes = JSON.parse(stderr);
+    const actual = actualRes.options;
+    const expected = require(jsonPath).options;
+    let errored = false;
+    for (let name of Object.getOwnPropertyNames(expected)) {
+      if (actual[name] !== expected[name]) {
+        // If object check just first level
+        if (typeof actual[name] === 'object' && typeof expected[name] === 'object') {
+          let error = false;
+          for (let field of Object.getOwnPropertyNames(actual[name])) {
+            if (actual[name][field] !== expected[name][field]) {
+              error = true;
+              break;
+            }
+          }
+          if (!error) {
+            continue;
+          }
+        }
+        console.error(name + ": " + actual[name] + " expected " + expected[name]);
+        errored = true;
+      }
+    }
+    if (errored) {
+      process.exit(1);
+    }
+    process.exit(0);
+  }
+
+  
   if (!binary) {
     console.error("No binary was generated for the asconfig test in " + process.cwd());
     process.exit(1);
@@ -29,6 +72,7 @@ asc.main(["assembly/index.ts", "--outFile", "output.wasm", "--explicitStart", ..
     theModule.exports._start();
   } catch (err) {
     console.error("The wasm module _start() function failed in " + process.cwd());
+    console.error(err);
     process.exit(1);
   }
   return 0;
diff --git a/tests/asconfig/package.json b/tests/asconfig/package.json
@@ -1,12 +1,13 @@
 {
   "private": true,
   "scripts": {
-    "test": "npm run test:use-consts && npm run test:target && npm run test:entry-points && npm run test:complicated",
+    "test": "npm run test:use-consts && npm run test:target && npm run test:entry-points && npm run test:complicated && npm run test:extends",
     "test:use-consts": "cd use-consts && npm run test",
     "test:entry-points": "cd entry-points && npm run test",
     "test:respect-inheritence": "cd respect-inheritence && npm run test",
     "test:target": "cd target && npm run test",
     "test:cyclical": "cd cyclical && npm run test",
-    "test:complicated": "cd complicated && npm run test"
+    "test:complicated": "cd complicated && npm run test",
+    "test:extends": "cd extends && npm run test"
   }
 }
diff --git a/tests/asconfig/target/asconfig.json b/tests/asconfig/target/asconfig.json
@@ -1,13 +1,17 @@
 {
   "targets": {
     "release": {
+      "noAssert": true,
+      "runtime": "none"
+    },
+    "debug": {
       "optimizeLevel": 3,
       "shrinkLevel": 1,
-      "enable": ["simd"]
-    },
-    "dev": {
+      "enable": ["simd"],      
       "debug": true
     }
   },
-  "options": {}
+  "options": {
+    "runtime": "stub"
+  }
 }
diff --git a/tests/asconfig/target/assembly/index.ts b/tests/asconfig/target/assembly/index.ts
@@ -1,3 +1,3 @@
-assert(ASC_OPTIMIZE_LEVEL == 3);
-assert(ASC_SHRINK_LEVEL == 1);
-assert(ASC_FEATURE_SIMD);
+assert(ASC_OPTIMIZE_LEVEL == 3, "expected optimize level == 3");
+assert(ASC_SHRINK_LEVEL == 1, "expected shrink level == 1");
+assert(ASC_FEATURE_SIMD, "expected SIMD enabled");
diff --git a/tests/asconfig/target/expected.json b/tests/asconfig/target/expected.json
@@ -0,0 +1,6 @@
+{
+  "options": {
+    "runtime": "none",
+    "noAssert": true
+  }
+}
diff --git a/tests/asconfig/target/package.json b/tests/asconfig/target/package.json
@@ -1,6 +1,6 @@
 {
   "private": true,
   "scripts": {
-    "test": "node ../index.js"
+    "test": "node ../index.js --target debug && node ../index.js --showConfig"
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+{`
	`2`	`+ "extends": "entry-points/asconfig.json"`
	`3`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,8 @@`
`1`	`1`	`{`
`2`	`2`	`"private": true,`
`3`	`3`	`"scripts": {`
`4`		`- "test": "node ../index.js && cd nested && npm run test"`
	`4`	`+ "test": "node ../index.js && npm run test:nested && npm run test:node",`
	`5`	`+ "test:nested": "cd nested && npm run test",`
	`6`	`+ "test:node": "cd node-resolution && npm run test"`
`5`	`7`	`}`
`6`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,9 @@`
`5`	`5`	`}`
`6`	`6`	`},`
`7`	`7`	`"options": {`
`8`		`- "enable": ["simd"]`
	`8`	`+ "enable": ["simd"],`
	`9`	`+ "runtime": "half",`
	`10`	`+ "noEmit": false`
`9`	`11`	`},`
`10`	`12`	`"extends": "./extends.json"`
`11`	`13`	`}`