Skip to content

Commit df3ae64

Browse files
redsun82Copilot
andcommitted
Go: move extractor smoke test into integration tests
The standalone `go/extractor-smoke-test` (run only from `go/Makefile`'s `test` target) was redundant: its core invariant, that traced and untraced extraction produce the same result, is already asserted by the `test-extraction` integration test, whose traced and autobuild cases share a single `test.expected`. The control-flow query it ran is covered far more thoroughly by the CFG library test. The only combination not reproduced was autobuild under build tracing, so add a `test_autobuild_traced` case to `test-extraction` and delete the smoke test. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
1 parent 97e3d36 commit df3ae64

8 files changed

Lines changed: 9 additions & 55 deletions

File tree

CODEOWNERS

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
/go/codeql-tools/ @github/codeql-go @github/code-scanning-language-coverage
1212
/go/downgrades/ @github/codeql-go @github/code-scanning-language-coverage
1313
/go/extractor/ @github/codeql-go @github/code-scanning-language-coverage
14-
/go/extractor-smoke-test/ @github/codeql-go @github/code-scanning-language-coverage
1514
/go/ql/test/extractor-tests/ @github/codeql-go @github/code-scanning-language-coverage
1615
/java/ @github/codeql-java
1716
/javascript/ @github/codeql-javascript

go/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ test: all build/testdb/check-upgrade-path
5858
# use GOOS=linux because GOOS=darwin GOARCH=386 is no longer supported
5959
env GOOS=linux GOARCH=386 codeql$(EXE) test run -j0 ql/test/query-tests/Security/CWE-681 --search-path .. --check-diff-informed --consistency-queries ql/consistency-queries --compilation-cache=$(cache) --dynamic-join-order-mode=$(rtjo)
6060
cd extractor; $(BAZEL) test ...
61-
bash extractor-smoke-test/test.sh || (echo "Extractor smoke test FAILED"; exit 1)
6261

6362
.PHONY: build/testdb/check-upgrade-path
6463
build/testdb/check-upgrade-path : build/testdb/go.dbscheme ql/lib/go.dbscheme

go/extractor-smoke-test/.gitignore

Lines changed: 0 additions & 4 deletions
This file was deleted.

go/extractor-smoke-test/expected.csv

Lines changed: 0 additions & 12 deletions
This file was deleted.

go/extractor-smoke-test/go.mod

Lines changed: 0 additions & 3 deletions
This file was deleted.

go/extractor-smoke-test/main.go

Lines changed: 0 additions & 8 deletions
This file was deleted.

go/extractor-smoke-test/test.sh

Lines changed: 0 additions & 26 deletions
This file was deleted.

go/ql/integration-tests/test-extraction/test.py

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,12 @@ def test_traced(codeql, go):
55

66
def test_autobuild(codeql, go):
77
codeql.database.create(source_root="src", extractor_option = ["extract_tests=true"])
8+
9+
def test_autobuild_traced(codeql, go):
10+
# Autobuild under build tracing must produce the same database as untraced
11+
# autobuild and explicit traced builds, all checked against test.expected.
12+
codeql.database.create(
13+
source_root="src",
14+
extractor_option = ["extract_tests=true"],
15+
_env={"CODEQL_EXTRACTOR_GO_BUILD_TRACING": "on"},
16+
)

0 commit comments

Comments
 (0)