From 1c5f4305b5eed5c8d8f88c685fb948601100b279 Mon Sep 17 00:00:00 2001
From: Dengke Tang <dengket@amazon.com>
Date: Mon, 13 Oct 2025 14:51:55 -0700
Subject: [PATCH 1/5] make sure it fails hard

---
 builder/main.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/builder/main.py b/builder/main.py
index 61beb82f6..cef66dc56 100755
--- a/builder/main.py
+++ b/builder/main.py
@@ -242,7 +242,7 @@ def upload_test_coverage(env):
         token = env.shell.get_secret("codecov-token", env.project.name)
     except:
         print(f"No token found for {env.project.name}, check https://app.codecov.io/github/awslabs/{env.project.name}/settings for token and add it to codecov-token in secret-manager.", file=sys.stderr)
-        exit()
+        sys.exit(1)
     # only works for linux for now
     env.shell.exec('curl', '-Os', 'https://uploader.codecov.io/latest/linux/codecov', check=True)
     env.shell.exec('chmod', '+x', 'codecov', check=True)

From 7c4efe24222184506e01b3a95cf26d6be7a9af42 Mon Sep 17 00:00:00 2001
From: Dengke Tang <dengket@amazon.com>
Date: Fri, 31 Oct 2025 11:42:39 -0700
Subject: [PATCH 2/5] expand the clang version to enable fuzz tests

---
 builder/core/data.py | 63 +++++++++++++++++++++++++++++++++++++-------
 1 file changed, 54 insertions(+), 9 deletions(-)

diff --git a/builder/core/data.py b/builder/core/data.py
index 5f03eadca..d6ec5419e 100644
--- a/builder/core/data.py
+++ b/builder/core/data.py
@@ -541,15 +541,60 @@ class PKG_TOOLS(Enum):
                 'cmake_args': ['-DENABLE_FUZZ_TESTS=ON'],
                 'apt_compiler_packages': ['libstdc++-9-dev'],
             },
-            '10': {},
-            '11': {},
-            '12': {},
-            '13': {},
-            '14': {},
-            '15': {},
-            '16': {},
-            '17': {},
-            '18': {},
+            '10': {
+                'c': "clang-10",
+                'cxx': "clang++-10",
+                'cmake_args': ['-DENABLE_FUZZ_TESTS=ON'],
+                'apt_compiler_packages': ['libstdc++-10-dev'],
+            },
+            '11': {
+                'c': "clang-11",
+                'cxx': "clang++-11",
+                'cmake_args': ['-DENABLE_FUZZ_TESTS=ON'],
+                'apt_compiler_packages': ['libstdc++-11-dev'],
+            },
+            '12': {
+                'c': "clang-12",
+                'cxx': "clang++-12",
+                'cmake_args': ['-DENABLE_FUZZ_TESTS=ON'],
+                'apt_compiler_packages': ['libstdc++-12-dev'],
+            },
+            '13': {
+                'c': "clang-13",
+                'cxx': "clang++-13",
+                'cmake_args': ['-DENABLE_FUZZ_TESTS=ON'],
+                'apt_compiler_packages': ['libstdc++-13-dev'],
+            },
+            '14': {
+                'c': "clang-14",
+                'cxx': "clang++-14",
+                'cmake_args': ['-DENABLE_FUZZ_TESTS=ON'],
+                'apt_compiler_packages': ['libstdc++-14-dev'],
+            },
+            '15': {
+                'c': "clang-15",
+                'cxx': "clang++-15",
+                'cmake_args': ['-DENABLE_FUZZ_TESTS=ON'],
+                'apt_compiler_packages': ['libstdc++-15-dev'],
+            },
+            '16': {
+                'c': "clang-16",
+                'cxx': "clang++-16",
+                'cmake_args': ['-DENABLE_FUZZ_TESTS=ON'],
+                'apt_compiler_packages': ['libstdc++-16-dev'],
+            },
+            '17': {
+                'c': "clang-17",
+                'cxx': "clang++-17",
+                'cmake_args': ['-DENABLE_FUZZ_TESTS=ON'],
+                'apt_compiler_packages': ['libstdc++-17-dev'],
+            },
+            '18': {
+                'c': "clang-18",
+                'cxx': "clang++-18",
+                'cmake_args': ['-DENABLE_FUZZ_TESTS=ON'],
+                'apt_compiler_packages': ['libstdc++-18-dev'],
+            },
         },
         'architectures': {
             # No fuzz tests on ARM

From 6327c0345368225c9d9a251f322b57d89a8938ac Mon Sep 17 00:00:00 2001
From: Dengke Tang <dengket@amazon.com>
Date: Fri, 7 Nov 2025 11:28:05 -0800
Subject: [PATCH 3/5] my best guess

---
 builder/core/data.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/builder/core/data.py b/builder/core/data.py
index d6ec5419e..7a8acde4e 100644
--- a/builder/core/data.py
+++ b/builder/core/data.py
@@ -569,31 +569,31 @@ class PKG_TOOLS(Enum):
                 'c': "clang-14",
                 'cxx': "clang++-14",
                 'cmake_args': ['-DENABLE_FUZZ_TESTS=ON'],
-                'apt_compiler_packages': ['libstdc++-14-dev'],
+                'apt_compiler_packages': ['libc++abi-14-dev'],
             },
             '15': {
                 'c': "clang-15",
                 'cxx': "clang++-15",
                 'cmake_args': ['-DENABLE_FUZZ_TESTS=ON'],
-                'apt_compiler_packages': ['libstdc++-15-dev'],
+                'apt_compiler_packages': ['libc++abi-15-dev'],
             },
             '16': {
                 'c': "clang-16",
                 'cxx': "clang++-16",
                 'cmake_args': ['-DENABLE_FUZZ_TESTS=ON'],
-                'apt_compiler_packages': ['libstdc++-16-dev'],
+                'apt_compiler_packages': ['llibc++abi-16-dev'],
             },
             '17': {
                 'c': "clang-17",
                 'cxx': "clang++-17",
                 'cmake_args': ['-DENABLE_FUZZ_TESTS=ON'],
-                'apt_compiler_packages': ['libstdc++-17-dev'],
+                'apt_compiler_packages': ['libc++abi-17-dev'],
             },
             '18': {
                 'c': "clang-18",
                 'cxx': "clang++-18",
                 'cmake_args': ['-DENABLE_FUZZ_TESTS=ON'],
-                'apt_compiler_packages': ['libstdc++-18-dev'],
+                'apt_compiler_packages': ['libc++abi-18-dev'],
             },
         },
         'architectures': {

From 451a0bf98e8536794afce14896dfff33aa66c4d4 Mon Sep 17 00:00:00 2001
From: Dengke Tang <dengket@amazon.com>
Date: Fri, 7 Nov 2025 13:30:25 -0800
Subject: [PATCH 4/5] typo

---
 builder/core/data.py | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/builder/core/data.py b/builder/core/data.py
index 7a8acde4e..38f5047aa 100644
--- a/builder/core/data.py
+++ b/builder/core/data.py
@@ -581,19 +581,12 @@ class PKG_TOOLS(Enum):
                 'c': "clang-16",
                 'cxx': "clang++-16",
                 'cmake_args': ['-DENABLE_FUZZ_TESTS=ON'],
-                'apt_compiler_packages': ['llibc++abi-16-dev'],
+                'apt_compiler_packages': ['libc++abi-16-dev'],
             },
+            # the ubuntu instance doesn't have 17 and 18 yet. We can try to install from source. But, skip for now.
             '17': {
-                'c': "clang-17",
-                'cxx': "clang++-17",
-                'cmake_args': ['-DENABLE_FUZZ_TESTS=ON'],
-                'apt_compiler_packages': ['libc++abi-17-dev'],
             },
             '18': {
-                'c': "clang-18",
-                'cxx': "clang++-18",
-                'cmake_args': ['-DENABLE_FUZZ_TESTS=ON'],
-                'apt_compiler_packages': ['libc++abi-18-dev'],
             },
         },
         'architectures': {

From 5dabd7b11821a584ae1d28f28782e063d12df32c Mon Sep 17 00:00:00 2001
From: Dengke Tang <dengket@amazon.com>
Date: Fri, 7 Nov 2025 14:03:00 -0800
Subject: [PATCH 5/5] 16 is also not found

---
 builder/core/data.py | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/builder/core/data.py b/builder/core/data.py
index 38f5047aa..61878445e 100644
--- a/builder/core/data.py
+++ b/builder/core/data.py
@@ -577,13 +577,9 @@ class PKG_TOOLS(Enum):
                 'cmake_args': ['-DENABLE_FUZZ_TESTS=ON'],
                 'apt_compiler_packages': ['libc++abi-15-dev'],
             },
+            # Those version are not found. We can try to install from source. But, skip for now.
             '16': {
-                'c': "clang-16",
-                'cxx': "clang++-16",
-                'cmake_args': ['-DENABLE_FUZZ_TESTS=ON'],
-                'apt_compiler_packages': ['libc++abi-16-dev'],
             },
-            # the ubuntu instance doesn't have 17 and 18 yet. We can try to install from source. But, skip for now.
             '17': {
             },
             '18': {