circleci: clean up codegen v1 runs

Remove the CodeGen v1 sections of the CI config because both OID and OIL use
CodeGen v2.

We were missing running any test that wasn't `Oi{d,l}Integration.*` before.
This now runs the unit tests again and requires a minor fix to one unit test.

Test plan:
- CI
This commit is contained in:
Jake Hillion 2024-01-03 15:26:45 +00:00 committed by Jake Hillion
parent beb404e41c
commit 6c90103278
2 changed files with 2 additions and 22 deletions

View File

@ -10,47 +10,27 @@ workflows:
cc: /usr/bin/gcc cc: /usr/bin/gcc
cxx: /usr/bin/g++ cxx: /usr/bin/g++
warnings_as_errors: "OFF" warnings_as_errors: "OFF"
- test:
name: test-codegenv1-gcc
requires:
- build-gcc
oid_test_args: "-Ftype-graph"
tests_regex: "OilIntegration\\..*"
- test: - test:
name: test-gcc name: test-gcc
requires: requires:
- build-gcc - build-gcc
tests_regex: "OidIntegration\\..*"
exclude_regex: ".*inheritance_polymorphic.*|.*arrays_member_int0" exclude_regex: ".*inheritance_polymorphic.*|.*arrays_member_int0"
- coverage: - coverage:
name: coverage name: coverage
requires: requires:
- test-gcc - test-gcc
- coverage:
name: coverage-codegenv1
requires:
- test-codegenv1-gcc
- build: - build:
name: build-clang name: build-clang
cc: /usr/bin/clang-12 cc: /usr/bin/clang-12
cxx: /usr/bin/clang++-12 cxx: /usr/bin/clang++-12
warnings_as_errors: "ON" warnings_as_errors: "ON"
- test:
name: test-codegenv1-clang
requires:
- build-clang
oid_test_args: "-Ftype-graph"
tests_regex: "OilIntegration\\..*"
# Tests disabled due to bad DWARF generated by the old clang compiler in CI
exclude_regex: "OilIntegration.fbstring_.*|OilIntegration.capture_keys_string|OilIntegration.capture_keys_multi_level"
- test: - test:
name: test-clang name: test-clang
requires: requires:
- build-clang - build-clang
tests_regex: "OidIntegration\\..*"
# Tests disabled due to bad DWARF generated by the old clang compiler in CI # Tests disabled due to bad DWARF generated by the old clang compiler in CI
exclude_regex: ".*inheritance_polymorphic.*|.*arrays_member_int0|.*fbstring.*|.*std_string_*|.*multi_arg_tb_.*|.*ignored_a" exclude_regex: ".*inheritance_polymorphic.*|.*arrays_member_int0|.*fbstring.*|.*std_string_*|.*multi_arg_tb_.*|.*ignored_a|OilIntegration.fbstring_.*|OilIntegration.capture_keys_string|OilIntegration.capture_keys_multi_level"
executors: executors:
nix-docker: nix-docker:

View File

@ -139,7 +139,7 @@ TEST_F(AddChildrenTest, InheritancePolymorphic) {
Parent (offset: 0) Parent (offset: 0)
[0] [0]
Member: vec_b (offset: 16) Member: vec_b (offset: 16)
[4] Class: vector<int, std::allocator<int> > [std::vector<<int, std::allocator<int> >] (size: 24) [4] Class: vector<int, std::allocator<int> > [std::vector<int, std::allocator<int> >] (size: 24)
Param Param
Primitive: int32_t Primitive: int32_t
Param Param