Fix target test and make entries path relative to baseDir

Willem Wyndham · Willem Wyndham · commit 949f3159836c · 2020-07-24T13:53:48.000-04:00
diff --git a/cli/asc.js b/cli/asc.js
@@ -303,7 +303,7 @@ exports.main = function main(argv, options, callback) {
     // Append entries
     if (asconfig.entries) {
       for (let entry of asconfig.entries) {
-        argv.push(optionsUtil.resolvePath(entry, asconfigDir));
+        argv.push(path.relative(baseDir, optionsUtil.resolvePath(entry, asconfigDir)));
       }
     }
 
diff --git a/tests/asconfig/target/asconfig.json b/tests/asconfig/target/asconfig.json
@@ -1,11 +1,13 @@
 {
   "targets": {
     "release": {
+      "noAssert": true,
+      "runtime": "none"
+    },
+    "debug": {
       "optimizeLevel": 3,
       "shrinkLevel": 1,
-      "enable": ["simd"]
-    },
-    "dev": {
+      "enable": ["simd"],      
       "debug": true
     }
   },
diff --git a/tests/asconfig/target/expected.json b/tests/asconfig/target/expected.json
@@ -1,5 +1,6 @@
 {
   "options": {
-    "runtime": "none"
+    "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 --target && node ../index.js --showConfig --runtime none"
+    "test": "node ../index.js --target debug && node ../index.js --showConfig"
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -303,7 +303,7 @@ exports.main = function main(argv, options, callback) {`
`303`	`303`	`// Append entries`
`304`	`304`	`if (asconfig.entries) {`
`305`	`305`	`for (let entry of asconfig.entries) {`
`306`		`- argv.push(optionsUtil.resolvePath(entry, asconfigDir));`
	`306`	`+ argv.push(path.relative(baseDir, optionsUtil.resolvePath(entry, asconfigDir)));`
`307`	`307`	`}`
`308`	`308`	`}`
`309`	`309`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"private": true,`
`3`	`3`	`"scripts": {`
`4`		`- "test": "node ../index.js --target && node ../index.js --showConfig --runtime none"`
	`4`	`+ "test": "node ../index.js --target debug && node ../index.js --showConfig"`
`5`	`5`	`}`
`6`	`6`	`}`