From 6c90103278bf139dea15731535a2264ce6b66cc8 Mon Sep 17 00:00:00 2001
From: Jake Hillion <jakehillion@meta.com>
Date: Wed, 3 Jan 2024 15:26:45 +0000
Subject: [PATCH] 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
---
 .circleci/config.yml       | 22 +---------------------
 test/test_add_children.cpp |  2 +-
 2 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 0a75d99..b91cc2c 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -10,47 +10,27 @@ workflows:
           cc: /usr/bin/gcc
           cxx: /usr/bin/g++
           warnings_as_errors: "OFF"
-      - test:
-          name: test-codegenv1-gcc
-          requires:
-            - build-gcc
-          oid_test_args: "-Ftype-graph"
-          tests_regex: "OilIntegration\\..*"
       - test:
           name: test-gcc
           requires:
             - build-gcc
-          tests_regex: "OidIntegration\\..*"
           exclude_regex: ".*inheritance_polymorphic.*|.*arrays_member_int0"
       - coverage:
           name: coverage
           requires:
             - test-gcc
-      - coverage:
-          name: coverage-codegenv1
-          requires:
-            - test-codegenv1-gcc
 
       - build:
           name: build-clang
           cc: /usr/bin/clang-12
           cxx: /usr/bin/clang++-12
           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:
           name: test-clang
           requires:
             - build-clang
-          tests_regex: "OidIntegration\\..*"
           # 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:
   nix-docker:
diff --git a/test/test_add_children.cpp b/test/test_add_children.cpp
index 0de8c5b..bf9736c 100644
--- a/test/test_add_children.cpp
+++ b/test/test_add_children.cpp
@@ -139,7 +139,7 @@ TEST_F(AddChildrenTest, InheritancePolymorphic) {
              Parent (offset: 0)
                [0]
              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
                    Primitive: int32_t
                  Param