Merge pull request #2258 from asger-semmle/js-ignore-codesql-databases

Approved by esbena

Author: semmle-qlci

javascript/extractor/src/com/semmle/js/extractor/AutoBuild.java

@@ -666,6 +666,9 @@ public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs)
               throws IOException {
             if (!dir.equals(currentRoot[0]) && (excludes.contains(dir) || dir.toFile().isHidden()))
               return FileVisitResult.SKIP_SUBTREE;
+            if (Files.exists(dir.resolve("codeql-database.yml"))) {
+              return FileVisitResult.SKIP_SUBTREE;
+            }
             return super.preVisitDirectory(dir, attrs);
           }
         };

javascript/extractor/src/com/semmle/js/extractor/test/AutoBuildTests.java

@@ -585,4 +585,12 @@ public void qhelpAsXmlAndAllXml() throws IOException {
     addFile(true, LGTM_SRC, "tst.qhelp");
     runTest();
   }
+
+  @Test
+  public void skipCodeQLDatabases() throws IOException {
+    addFile(true, LGTM_SRC, "tst.js");
+    addFile(false, LGTM_SRC, "db/codeql-database.yml");
+    addFile(false, LGTM_SRC, "db/foo.js");
+    runTest();
+  }
 }