Revert Test building with clang against the OpenCV built with clang

It was actually a workaround for broken struct return handling
twistedfall · Jan 7, 2022 · f608911 · f608911
1 parent 1232513
commit f608911
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 12 deletions.
diff --git a/.github/workflows/opencv-rust.yml b/.github/workflows/opencv-rust.yml
@@ -24,36 +24,25 @@ jobs:
         version:
           - opencv: 3.4.17
           - opencv: 4.5.5
-        compiler:
-          - cc: gcc
-            cxx: g++
-          - cc: clang
-            cxx: clang++
         exclude:
           - os:
               family: osx
             version:
               opencv: 3.4.17
-          - os:
-              family: osx
-            compiler:
-              cc: gcc
     runs-on: ${{ matrix.os.image }}
     env:
       OS_FAMILY: ${{ matrix.os.family }}
       RUST_TOOLCHAIN: ${{ matrix.rust }}
       Atlas_ROOT_DIR: /usr/include/ # for cmake to find lapacke.h
       OPENCV_VERSION: ${{ matrix.version.opencv }}
-      CC: ${{ matrix.compiler.cc }}
-      CXX: ${{ matrix.compiler.cxx }}
     steps:
       - uses: actions/checkout@v2
 
       - name: Cache dependencies
         uses: actions/cache@v1
         with:
           path: ~/build
-          key: ${{ runner.os }}-${{ matrix.version.opencv }}-${{ matrix.compiler.cc }}-build
+          key: ${{ runner.os }}-${{ matrix.version.opencv }}-build
 
       - name: Install dependencies
         run: ci/install.sh

diff --git a/ci/script.sh b/ci/script.sh
@@ -60,3 +60,8 @@ cargo test --release -vv --features "$FEATURES,clang-runtime"
 pushd ci/test-proj-clang-runtime
 cargo run -vv
 popd
+
+export CXX=clang++
+touch build.rs
+cargo test -vv
+cargo test --release -vv