chg: dev: use C++ namespace for msys2 builds, workflow and tox cleanup

Signed-off-by: Stephen L Arnold <[email protected]>
berkeley-abc · Feb 26, 2025 · f4b845d · f4b845d
1 parent e3d76a1
commit f4b845d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -134,7 +134,6 @@ jobs:
           brew install gcc@${{ matrix.version }}
           echo "CC=gcc-${{ matrix.version }}" >> $GITHUB_ENV
           echo "CXX=g++-${{ matrix.version }}" >> $GITHUB_ENV
-          brew install googletest
         fi
 
     - name: Build and test MacOS

diff --git a/.github/workflows/win.yml b/.github/workflows/win.yml
@@ -44,8 +44,11 @@ jobs:
         cmake
         -Wdev
         -B build
+        -DABC_USE_NAMESPACE=xxxx
         -DBUILD_SHARED_LIBS=OFF
-        -DCMAKE_BUILD_TYPE=Debug
+        -DABC_USE_NO_READLINE=ON
+        -DVENDOR_GTEST=ON
+        -DCMAKE_BUILD_TYPE=RelWithDebInfo
         -DCMAKE_INSTALL_PREFIX=$PWD/_dist
 
     - name: CMake build

diff --git a/tox.ini b/tox.ini
@@ -86,7 +86,7 @@ commands =
     clang: lcov_cobertura {toxinidir}/build/coverage/lcov.info --base-dir {toxinidir}/src --output coverage.xml
     {base,libs}: cmake --build . --target install
     {base,libs}: bash -c 'find $PREFIX/ -type f -name \*abc\* -o -name demo | xargs ls -lh'
-    ctest: ctest -j {env:CPUS} --build-generator {posargs:"Ninja"} --build-and-test . build --build-options -DABC_USE_NAMESPACE={env:ABC_USE_NAMESPACE} -DABC_SKIP_EXE=ON -DCMAKE_BUILD_TYPE={env:BUILD_TYPE} --test-command ctest -C {env:BUILD_TYPE} --rerun-failed --output-on-failure -V
+    ctest: ctest -j {env:CPUS} --build-generator {posargs:"Ninja"} --build-and-test . build --build-options -DVENDOR_GTEST=ON -DABC_USE_NAMESPACE={env:ABC_USE_NAMESPACE} -DABC_SKIP_EXE=ON -DCMAKE_BUILD_TYPE={env:BUILD_TYPE} --test-command ctest -C {env:BUILD_TYPE} --rerun-failed --output-on-failure -V
     ctestwin: ctest --build-generator {posargs:"Visual Studio 16 2019"} --build-and-test . build --build-options -DVENDOR_GTEST=ON -DBUILD_SHARED_LIBS=ON -DABC_USE_NO_PTHREADS=ON -DABC_USE_NO_READLINE=ON -DCMAKE_BUILD_TYPE={env:BUILD_TYPE} --test-command ctest -C {env:BUILD_TYPE} --rerun-failed --output-on-failure -V
     ctest: bash -c 'ls -lh build/*abc* || true'
     lint: bash -c 'cpplint --output=gsed {toxinidir}/src/base/main/* {toxinidir}/lib/*'