|WARNING| pw132719 [PATCH] [v2] ci: test stdatomic API

[dpdklab at iol.unh.edu]

Test-Label: iol-testing
Test-Status: WARNING
http://dpdk.org/patch/132719

_apply patch failure_

Submitter: David Marchand <david.marchand at redhat.com>
Date: Tuesday, October 17 2023 07:15:18 
Applied on: CommitID:55bc9233a2065b3003e90710e4d139159f7c3ebf
Apply patch set 132719 failed:

Checking patch .ci/linux-build.sh...
error: while searching for:
OPTS="$OPTS -Dplatform=generic"
OPTS="$OPTS -Ddefault_library=$DEF_LIB"
OPTS="$OPTS -Dbuildtype=$buildtype"
OPTS="$OPTS -Dcheck_includes=true"
if [ "$MINI" = "true" ]; then
    OPTS="$OPTS -Denable_drivers=net/null"
    OPTS="$OPTS -Ddisable_libs=*"

error: patch failed: .ci/linux-build.sh:92
Checking patch .github/workflows/build.yml...
error: while searching for:
      REF_GIT_TAG: none
      RISCV64: ${{ matrix.config.cross == 'riscv64' }}
      RUN_TESTS: ${{ contains(matrix.config.checks, 'tests') }}

    strategy:
      fail-fast: false

error: patch failed: .github/workflows/build.yml:30
error: while searching for:
          - os: ubuntu-20.04
            compiler: gcc
            mini: mini
          - os: ubuntu-20.04
            compiler: gcc
            checks: debug+doc+examples+tests

error: patch failed: .github/workflows/build.yml:38
error: while searching for:
        > ~/env
        echo CC=ccache ${{ matrix.config.compiler }} >> ~/env
        echo DEF_LIB=${{ matrix.config.library }} >> ~/env
    - name: Load the cached image
      run: |
        docker load -i ~/.image/${{ matrix.config.image }}.tar

error: patch failed: .github/workflows/build.yml:241
Checking patch devtools/test-meson-builds.sh...
error: while searching for:
	for s in static shared ; do
		if [ $s = shared ] ; then
			abicheck=ABI
		else
			abicheck=skipABI # save time and disk space
		fi
		export CC="$CCACHE $c"
		build build-$c-$s $c $abicheck --default-library=$s
		unset CC
	done
done

error: patch failed: devtools/test-meson-builds.sh:227
Applying patch .ci/linux-build.sh with 1 reject...
Rejected hunk #1.
Applying patch .github/workflows/build.yml with 3 rejects...
Rejected hunk #1.
Rejected hunk #2.
Rejected hunk #3.
Applying patch devtools/test-meson-builds.sh with 1 reject...
Rejected hunk #1.
hint: Use 'git am --show-current-patch' to see the failed patch
diff a/.ci/linux-build.sh b/.ci/linux-build.sh	(rejected hunks)
@@ -92,7 +92,11 @@ fi
 OPTS="$OPTS -Dplatform=generic"
 OPTS="$OPTS -Ddefault_library=$DEF_LIB"
 OPTS="$OPTS -Dbuildtype=$buildtype"
-OPTS="$OPTS -Dcheck_includes=true"
+if [ "$STDATOMIC" = "true" ]; then
+	OPTS="$OPTS -Denable_stdatomic=true"
+else
+	OPTS="$OPTS -Dcheck_includes=true"
+fi
 if [ "$MINI" = "true" ]; then
     OPTS="$OPTS -Denable_drivers=net/null"
     OPTS="$OPTS -Ddisable_libs=*"
diff a/.github/workflows/build.yml b/.github/workflows/build.yml	(rejected hunks)
@@ -30,6 +30,7 @@ jobs:
       REF_GIT_TAG: none
       RISCV64: ${{ matrix.config.cross == 'riscv64' }}
       RUN_TESTS: ${{ contains(matrix.config.checks, 'tests') }}
+      STDATOMIC: ${{ contains(matrix.config.checks, 'stdatomic') }}
 
     strategy:
       fail-fast: false
@@ -38,6 +39,12 @@ jobs:
           - os: ubuntu-20.04
             compiler: gcc
             mini: mini
+          - os: ubuntu-20.04
+            compiler: gcc
+            checks: stdatomic
+          - os: ubuntu-20.04
+            compiler: clang
+            checks: stdatomic
           - os: ubuntu-20.04
             compiler: gcc
             checks: debug+doc+examples+tests
@@ -241,6 +248,7 @@ jobs:
         > ~/env
         echo CC=ccache ${{ matrix.config.compiler }} >> ~/env
         echo DEF_LIB=${{ matrix.config.library }} >> ~/env
+        echo STDATOMIC=false >> ~/env
     - name: Load the cached image
       run: |
         docker load -i ~/.image/${{ matrix.config.image }}.tar
diff a/devtools/test-meson-builds.sh b/devtools/test-meson-builds.sh	(rejected hunks)
@@ -227,11 +227,13 @@ for c in gcc clang ; do
 	for s in static shared ; do
 		if [ $s = shared ] ; then
 			abicheck=ABI
+			stdatomic=-Denable_stdatomic=true
 		else
 			abicheck=skipABI # save time and disk space
+			stdatomic=-Denable_stdatomic=false
 		fi
 		export CC="$CCACHE $c"
-		build build-$c-$s $c $abicheck --default-library=$s
+		build build-$c-$s $c $abicheck $stdatomic --default-library=$s
 		unset CC
 	done
 done

https://lab.dpdk.org/results/dashboard/patchsets/27959/

UNH-IOL DPDK Community Lab