Fix Intel case

- x86_64 glibc is supported - 32bit (x86 or armv7hf) glibc is not - musl is not (yet), for all cpu archs Add better negative tests to cover those base cases.
DataDog · Oct 31, 2024 · 34b9e67 · 34b9e67
1 parent 1710985
commit 34b9e67
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/lib-injection/requirements.json b/lib-injection/requirements.json
@@ -4,7 +4,7 @@
   "native_deps": {
     "glibc": [
       {
-        "arch": "x86",
+        "arch": "x64",
         "supported": true,
         "min": "2.27",
         "description": "libffi needs memfd_create"
@@ -18,7 +18,7 @@
     ],
     "musl": [
       {
-        "arch": "x86",
+        "arch": "x64",
         "supported": false,
         "description": "no musl build"
       },

diff --git a/lib-injection/test_allow.json b/lib-injection/test_allow.json
@@ -1,4 +1,4 @@
 [
-  {"name": "✅ 2.27 glibc x86"  ,"filepath":  "/some/path", "args": [], "envars":  [], "host": {"os": "linux", "arch": "x86"  , "libc":  "glibc:2.27"}},
+  {"name": "✅ 2.27 glibc x86"  ,"filepath":  "/some/path", "args": [], "envars":  [], "host": {"os": "linux", "arch": "x64"  , "libc":  "glibc:2.27"}},
   {"name": "✅ 2.27 glibc arm64","filepath":  "/some/path", "args": [], "envars":  [], "host": {"os": "linux", "arch": "arm64", "libc":  "glibc:2.27"}}
 ]
diff --git a/lib-injection/test_block.json b/lib-injection/test_block.json
@@ -1,4 +1,12 @@
 [
-  {"name": "❌ 2.26 glibc x86"  ,"filepath":  "/some/path", "args": [], "envars":  [], "host": {"os": "linux", "arch": "x86"  , "libc":  "glibc:2.26"}},
+  {"name": "❌ musl x86"  ,"filepath":  "/some/path", "args": [], "envars":  [], "host": {"os": "linux", "arch": "x86"  , "libc":  "musl:"}},
+  {"name": "❌ musl arm"  ,"filepath":  "/some/path", "args": [], "envars":  [], "host": {"os": "linux", "arch": "arm"  , "libc":  "musl:"}},
+  {"name": "❌ musl x64"  ,"filepath":  "/some/path", "args": [], "envars":  [], "host": {"os": "linux", "arch": "x64"  , "libc":  "musl:"}},
+  {"name": "❌ musl arm64"  ,"filepath":  "/some/path", "args": [], "envars":  [], "host": {"os": "linux", "arch": "arm64"  , "libc":  "musl:"}},
+
+  {"name": "❌ 2.27 glibc x86"  ,"filepath":  "/some/path", "args": [], "envars":  [], "host": {"os": "linux", "arch": "x86"  , "libc":  "glibc:2.27"}},
+  {"name": "❌ 2.27 glibc arm"  ,"filepath":  "/some/path", "args": [], "envars":  [], "host": {"os": "linux", "arch": "arm"  , "libc":  "glibc:2.27"}},
+
+  {"name": "❌ 2.26 glibc x64"  ,"filepath":  "/some/path", "args": [], "envars":  [], "host": {"os": "linux", "arch": "x64"  , "libc":  "glibc:2.26"}},
   {"name": "❌ 2.26 glibc arm64","filepath":  "/some/path", "args": [], "envars":  [], "host": {"os": "linux", "arch": "arm64", "libc":  "glibc:2.26"}}
 ]