Cosmetic: Possibility to customize some RWLock test parameters at bui…

…ld time and workflow changes to allow tests passing on a slow Mac VM
oleh-derevenko · Aug 13, 2023 · e1c6d0d · e1c6d0d
1 parent be26695
commit e1c6d0d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: bootstrap
       run: ./bootstrap
     - name: configure
@@ -27,13 +27,13 @@ jobs:
     runs-on: macos-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: packages
       run: brew install automake
     - name: bootstrap
       run: ./bootstrap
     - name: configure
-      run: ./configure CXXFLAGS="-std=c++14 -O3 -g"
+      run: ./configure CXXFLAGS="-std=c++14 -O3 -g -DMGTEST_RWLOCK_ITERATION_COUNT=100000"
     - name: make
       run: make
     - name: make check

diff --git a/test/rwltest.h b/test/rwltest.h
@@ -15,11 +15,19 @@
 #include "mgtest_common.h"
 
 
+#ifndef MGTEST_RWLOCK_TEST_TRYWRLOCK
 #define MGTEST_RWLOCK_TEST_TRYWRLOCK	1
+#endif
+#ifndef MGTEST_RWLOCK_TEST_TRYRDLOCK
 #define MGTEST_RWLOCK_TEST_TRYRDLOCK	1
+#endif
 
+#ifndef MGTEST_RWLOCK_ITERATION_COUNT
 #define MGTEST_RWLOCK_ITERATION_COUNT	1000000
+#endif
+#ifndef MGTEST_RWLOCK_WRITE_CHANNELS
 #define MGTEST_RWLOCK_WRITE_CHANNELS	4
+#endif
 
 #define MGTEST_RWLOCK_MINIMAL_READERS_TILL_WP		1
 #define MGTEST_RWLOCK_AVERAGE_READERS_TILL_WP		2