Skip to content

Commit 57f7602

Browse files
committed
Go: Unified handling of in-tree extractor packs.
1 parent 5c77b87 commit 57f7602

File tree

3 files changed

+5
-6
lines changed

3 files changed

+5
-6
lines changed

go/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,5 +65,4 @@ codeql_pack(
6565
"//go/downgrades",
6666
"//go/extractor:tokenizer",
6767
],
68-
install_dest = "build/codeql-extractor-pack",
6968
)

go/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
all: gen extractor
22

3-
EXTRACTOR_PACK_OUT = build/codeql-extractor-go
3+
EXTRACTOR_PACK_OUT = extractor-pack
44

55
.PHONY: extractor gen clean autoformat check-formatting
66

@@ -45,9 +45,9 @@ ql/lib/go.dbscheme.stats: ql/lib/go.dbscheme build/stats/src.stamp extractor
4545
codeql dataset measure -o $@ build/stats/database/db-go
4646

4747
test: all build/testdb/check-upgrade-path
48-
codeql test run -j0 ql/test --search-path build/codeql-extractor-go --consistency-queries ql/test/consistency --compilation-cache=$(cache)
48+
codeql test run -j0 ql/test --consistency-queries ql/test/consistency --compilation-cache=$(cache)
4949
# use GOOS=linux because GOOS=darwin GOARCH=386 is no longer supported
50-
env GOOS=linux GOARCH=386 codeql$(EXE) test run -j0 ql/test/query-tests/Security/CWE-681 --search-path build/codeql-extractor-go --consistency-queries ql/test/consistency --compilation-cache=$(cache)
50+
env GOOS=linux GOARCH=386 codeql$(EXE) test run -j0 ql/test/query-tests/Security/CWE-681 --consistency-queries ql/test/consistency --compilation-cache=$(cache)
5151
cd extractor; bazel test ...
5252
bash extractor-smoke-test/test.sh || (echo "Extractor smoke test FAILED"; exit 1)
5353

go/extractor-smoke-test/test.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ cd $DIR
77

88
rm -rf testdb
99

10-
codeql database create --language=go testdb --search-path ../build/codeql-extractor-go
10+
codeql database create --language=go testdb
1111
codeql dataset check testdb/db-go
1212
codeql query run ../ql/test/library-tests/semmle/go/controlflow/ControlFlowGraph/ControlFlowNode_getASuccessor.ql --database=testdb --output=notracing-out.bqrs --search-path ..
1313
codeql bqrs decode notracing-out.bqrs --format=csv --output=notracing-out.csv
@@ -19,7 +19,7 @@ export CODEQL_EXTRACTOR_GO_BUILD_TRACING=on
1919

2020
rm -rf testdb
2121

22-
codeql database create --language=go testdb --search-path ../build/codeql-extractor-go
22+
codeql database create --language=go testdb
2323
codeql dataset check testdb/db-go
2424
codeql query run ../ql/test/library-tests/semmle/go/controlflow/ControlFlowGraph/ControlFlowNode_getASuccessor.ql --database=testdb --output=tracing-out.bqrs --search-path ..
2525
codeql bqrs decode tracing-out.bqrs --format=csv --output=tracing-out.csv

0 commit comments

Comments
 (0)