Merge 610e78f into 4aba98c

iovisor · Oct 22, 2022 · a8a4b9b · a8a4b9b
2 parents 4aba98c + 610e78f
commit a8a4b9b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/.github/workflows/posix.yml b/.github/workflows/posix.yml
@@ -1,5 +1,6 @@
 #
 # Copyright (c) 2022-present, IO Visor Project
+# SPDX-License-Identifier: Apache-2.0
 # All rights reserved.
 #
 # This source code is licensed in accordance with the terms specified in
@@ -180,7 +181,7 @@ jobs:
 
     - name: Run the local bpf_conformance tests
       run: |
-        export BPF_CONFORMANCE_RUNNER="build_bpf_conformance/src/bpf_conformance_runner"
+        export BPF_CONFORMANCE_RUNNER="build_bpf_conformance/bin/bpf_conformance_runner"
         export BPF_CONFORMANCE_TEST_DIR="--test_file_directory tests"
 
         # For arm64, we need to run the tests in qemu, so use the scripts
@@ -197,8 +198,10 @@ jobs:
 
     - name: Run the upstream bpf_conformance tests
       run: |
-        export BPF_CONFORMANCE_RUNNER="build_bpf_conformance/src/bpf_conformance_runner"
+        export BPF_CONFORMANCE_RUNNER="build_bpf_conformance/bin/bpf_conformance_runner"
         export BPF_CONFORMANCE_TEST_DIR="--test_file_directory external/bpf_conformance/tests"
+        # Exclude tests that check atomic operations, as they are not supported by uBPF yet.
+        export BPF_CONFORMANCE_TEST_FILTER="--exclude_regex lock"
 
         # For arm64, we need to run the tests in qemu, so use the scripts
         if [[ "${{ inputs.arch }}" == "arm64" ]] ; then
@@ -209,8 +212,8 @@ jobs:
           export BPF_CONFORMANCE_PLUGIN_INTERPRET="--plugin_path build/bin/ubpf_plugin --plugin_options --interpret"
         fi
 
-        ${BPF_CONFORMANCE_RUNNER} ${BPF_CONFORMANCE_TEST_DIR} ${BPF_CONFORMANCE_PLUGIN_JIT}
-        ${BPF_CONFORMANCE_RUNNER} ${BPF_CONFORMANCE_TEST_DIR} ${BPF_CONFORMANCE_PLUGIN_INTERPRET}
+        ${BPF_CONFORMANCE_RUNNER} ${BPF_CONFORMANCE_TEST_DIR} ${BPF_CONFORMANCE_TEST_FILTER} ${BPF_CONFORMANCE_PLUGIN_JIT}
+        ${BPF_CONFORMANCE_RUNNER} ${BPF_CONFORMANCE_TEST_DIR} ${BPF_CONFORMANCE_TEST_FILTER} ${BPF_CONFORMANCE_PLUGIN_INTERPRET}
 
     - name: Generate code coverage report
       if: inputs.enable_coverage == true
@@ -315,4 +318,4 @@ jobs:
 
     - name: Perform CodeQL Analysis
       if: inputs.build_codeql == true
-      uses: github/codeql-action/analyze@cc7986c02bac29104a72998e67239bb5ee2ee110
+      uses: github/codeql-action/analyze@cc7986c02bac29104a72998e67239bb5ee2ee110
diff --git a/external/bpf_conformance b/external/bpf_conformance