Fix include paths being passed to subprocess

src/config.js

@@ -83,12 +83,6 @@ function optionsToArgs(options) {
 
 function configToArgs(config, specFiles = [], options = {}) {
     let retval = [];
-    if (config.include_paths) {
-        ensureArray(config.include_paths).forEach(path => {
-            retval.push('-I');
-            retval.push(path);
-        });
-    }
     if (config.exclude) {
         ensureArray(config.exclude).forEach(exclude => {
             retval.push('--exclude');
@@ -121,6 +115,13 @@ function prepareLauncher(config, options = {}) {
                 launcher.setenv(key, config.environment[key], true);
         });
     }
+    if (config.include_paths) {
+        const existingPaths = launcher.getenv('GJS_PATH');
+        const paths = ensureArray(config.include_paths).slice();
+        if (existingPaths)
+            paths.unshift(existingPaths);
+        launcher.setenv('GJS_PATH', paths.join(':'), /* overwrite = */ true);
+    }
     return launcher;
 }
 

src/options.js

@@ -73,14 +73,18 @@ function parseOptions(argv) {
 
     let argvElement;
     while ((argvElement = argv.shift())) {
-        if (!argvElement.startsWith('--')) {
+        if (!argvElement.startsWith('-')) {
             files.push(argvElement);
             continue;
         }
 
+        if (!argvElement.startsWith('--')) {
+            printerr(`warning: Unknown argument "${argvElement}"`);
+            continue;
+        }
         const argName = argvElement.slice(2);
         if (!(argName in ARGS)) {
-            printerr(`warning: Unknown argument "${argName}"`);
+            printerr(`warning: Unknown argument "${argvElement}"`);
             continue;
         }
 

test/configSpec.js

@@ -84,23 +84,6 @@ describe('Configuration options to arguments', function () {
         expect(args.indexOf('--no-color')).toBeGreaterThan(args.indexOf('--color'));
     });
 
-    it('adds one search path', function () {
-        const args = Config.configToArgs({include_paths: '/a'});
-        expect(args.join(' ')).toMatch('-I /a');
-    });
-
-    it('adds multiple search paths', function () {
-        const args = Config.configToArgs({include_paths: ['/a', '/b']});
-        expect(args.join(' ')).toMatch('-I /a');
-        expect(args.join(' ')).toMatch('-I /b');
-    });
-
-    it('adds search paths in the right order', function () {
-        const args = Config.configToArgs({include_paths: ['/a', '/b']});
-        const argstring = args.join(' ');
-        expect(argstring.indexOf('-I /a')).toBeLessThan(argstring.indexOf('-I /b'));
-    });
-
     it('adds one exclusion path', function () {
         const args = Config.configToArgs({exclude: 'a'});
         expect(args.join(' ')).toMatch('--exclude a');
@@ -160,13 +143,10 @@ describe('Configuration options to arguments', function () {
     it('passes the config file on to the subprocess as arguments', function () {
         const args = Config.configToArgs({
             environment: {},
-            include_paths: ['/path1', '/path2'],
             options: ['--color'],
             exclude: ['nonspec*.js'],
             spec_files: ['a.js', 'b.js'],
         }, [], {});
-        expect(args.join(' ')).toMatch('-I /path1');
-        expect(args.join(' ')).toMatch('-I /path2');
         expect(args.join(' ')).toMatch(/--exclude nonspec\*\.js/);
         expect(args).toContain('--color', 'a.js', 'b.js');
     });
@@ -179,6 +159,14 @@ describe('Configuration options to arguments', function () {
         expect(args).toContain('spec1.js');
         expect(args).not.toContain('spec2.js');
     });
+
+    it('does not pass include paths as -I arguments', function () {
+        const args = Config.configToArgs({
+            environment: {},
+            include_paths: ['/path1', '/path2'],
+        }, [], {});
+        expect(args.join(' ')).not.toMatch(/-I/);
+    });
 });
 
 describe('Manipulating the environment', function () {
@@ -199,6 +187,27 @@ describe('Manipulating the environment', function () {
         });
         expect(launcher.getenv('MY_VARIABLE')).toBeNull();
     });
+
+    it('adds one search path', function () {
+        const launcher = Config.prepareLauncher({include_paths: '/a'});
+        expect(launcher.getenv('GJS_PATH')).toEqual('/a');
+    });
+
+    it('adds multiple search paths in the right order', function () {
+        const launcher = Config.prepareLauncher({include_paths: ['/a', '/b']});
+        expect(launcher.getenv('GJS_PATH')).toEqual('/a:/b');
+    });
+
+    it('adds search paths with a lower priority than existing search paths', function () {
+        const oldPath = GLib.getenv('GJS_PATH');
+        GLib.setenv('GJS_PATH', '/a:/b', /* overwrite = */ true);
+        const launcher = Config.prepareLauncher({include_paths: ['/c', '/d']});
+        expect(launcher.getenv('GJS_PATH')).toEqual('/a:/b:/c:/d');
+        if (oldPath)
+            GLib.setenv('GJS_PATH', oldPath, /* overwrite = */ true);
+        else
+            GLib.unsetenv('GJS_PATH');
+    });
 });
 
 describe('Manipulating the launcher command line', function () {

test/fixtures/include.json

@@ -0,0 +1,4 @@
+{
+    "include_paths": "include",
+    "spec_files": "someSpec.js"
+}

test/fixtures/include/module.js

@@ -0,0 +1,5 @@
+/* exported importedFunction */
+
+function importedFunction() {
+    return true;
+}

test/fixtures/include/spec.js

@@ -0,0 +1,5 @@
+describe('A spec that should not be loaded', function () {
+    it('is not loaded', function () {
+        fail('Spec was loaded when it should not be');
+    });
+});

test/jasmineBootSpec.js

@@ -115,6 +115,8 @@ describe('Jasmine boot', function () {
         expect(testJasmine.specFiles).toEqual([]);
         testJasmine.addSpecFiles([`${SRCDIR}test/fixtures`]);
         expect(testJasmine.specFiles).toMatchAllFiles([
+            `${SRCDIR}test/fixtures/include/module.js`,
+            `${SRCDIR}test/fixtures/include/spec.js`,
             `${SRCDIR}test/fixtures/otherSpec.js`,
             `${SRCDIR}test/fixtures/path1/test.js`,
             `${SRCDIR}test/fixtures/path2/test.js`,
@@ -139,6 +141,8 @@ describe('Jasmine boot', function () {
         testJasmine.exclusions = ['otherSpec.js', 'syntaxErrorSpec.js'];
         testJasmine.addSpecFiles([`${SRCDIR}test/fixtures`]);
         expect(testJasmine.specFiles).toMatchAllFiles([
+            `${SRCDIR}test/fixtures/include/module.js`,
+            `${SRCDIR}test/fixtures/include/spec.js`,
             `${SRCDIR}test/fixtures/someSpec.js`,
             `${SRCDIR}test/fixtures/path1/test.js`,
             `${SRCDIR}test/fixtures/path2/test.js`,
@@ -149,6 +153,8 @@ describe('Jasmine boot', function () {
         testJasmine.exclusions = ['test/fixtures'];
         testJasmine.addSpecFiles([`${SRCDIR}test/fixtures`]);
         expect(testJasmine.specFiles).toMatchAllFiles([
+            `${SRCDIR}test/fixtures/include/module.js`,
+            `${SRCDIR}test/fixtures/include/spec.js`,
             `${SRCDIR}test/fixtures/path1/test.js`,
             `${SRCDIR}test/fixtures/path2/test.js`,
         ]);

test/optionsSpec.js

@@ -41,4 +41,9 @@ describe('Argument parser', function () {
         Options.parseOptions(args);
         expect(args.length).toBe(3);
     });
+
+    it('does not treat a short option as a file', function () {
+        const [files] = Options.parseOptions(['-c', 'file.js']);
+        expect(files).toEqual(['file.js']);
+    });
 });