Merge remote-tracking branch 'origin/main' into runner_analyze

.github/workflows/pr-checks.yml

@@ -65,9 +65,12 @@ jobs:
         echo "Success: node_modules are up to date"
 
   npm-test:
-    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        os: [ubuntu-latest,macos-latest]
+    runs-on: ${{ matrix.os }}
 
     steps:
     - uses: actions/checkout@v1
     - name: npm run-script test
-      run: npm run-script test
+      run: npm run-script test

lib/defaults.json

@@ -1,3 +1,3 @@
 {
-    "bundleVersion": "codeql-bundle-20200630"
+    "bundleVersion": "codeql-bundle-20200826"
 }

lib/tracer-config.test.js

@@ -259,13 +259,19 @@ ava_1.default('getCombinedTracerConfig - valid spec file', async (t) => {
             },
         });
         const result = await tracer_config_1.getCombinedTracerConfig(config, codeQL);
+        const expectedEnv = {
+            'foo': 'bar',
+            'ODASA_TRACER_CONFIGURATION': result.spec,
+        };
+        if (process.platform === 'darwin') {
+            expectedEnv['DYLD_INSERT_LIBRARIES'] = path.join(path.dirname(codeQL.getPath()), 'tools', 'osx64', 'libtrace.dylib');
+        }
+        else if (process.platform !== 'win32') {
+            expectedEnv['LD_PRELOAD'] = path.join(path.dirname(codeQL.getPath()), 'tools', 'linux64', '${LIB}trace.so');
+        }
         t.deepEqual(result, {
             spec: path.join(tmpDir, 'compound-spec'),
-            env: {
+            env: expectedEnv,
-                'foo': 'bar',
-                'ODASA_TRACER_CONFIGURATION': result.spec,
-                'LD_PRELOAD': path.join(path.dirname(codeQL.getPath()), 'tools', 'linux64', '${LIB}trace.so'),
-            }
         });
     });
 });

src/defaults.json

@@ -1,3 +1,3 @@
 {
-	"bundleVersion": "codeql-bundle-20200630"
+	"bundleVersion": "codeql-bundle-20200826"
 }

src/tracer-config.test.ts

@@ -299,13 +299,20 @@ test('getCombinedTracerConfig - valid spec file', async t => {
     });
 
     const result = await getCombinedTracerConfig(config, codeQL);
+
+    const expectedEnv = {
+      'foo': 'bar',
+      'ODASA_TRACER_CONFIGURATION': result!.spec,
+    };
+    if (process.platform === 'darwin') {
+      expectedEnv['DYLD_INSERT_LIBRARIES'] = path.join(path.dirname(codeQL.getPath()), 'tools', 'osx64', 'libtrace.dylib');
+    } else if (process.platform !== 'win32') {
+      expectedEnv['LD_PRELOAD'] = path.join(path.dirname(codeQL.getPath()), 'tools', 'linux64', '${LIB}trace.so');
+    }
+
     t.deepEqual(result, {
       spec: path.join(tmpDir, 'compound-spec'),
-      env: {
+      env: expectedEnv,
-        'foo': 'bar',
-        'ODASA_TRACER_CONFIGURATION': result!.spec,
-        'LD_PRELOAD': path.join(path.dirname(codeQL.getPath()), 'tools', 'linux64', '${LIB}trace.so'),
-      }
     });
   });
 });