Add NOMAC option

.github/workflows/coverage.yml

@@ -46,6 +46,9 @@ jobs:
       - name: Install dependencies
         run: opam install . --deps-only --locked --with-test
 
+      - name: Install os gem for operating system detection
+        run: sudo gem install os
+
       - name: Install coverage dependencies
         run: opam install bisect_ppx
 

.github/workflows/docs.yml

@@ -46,6 +46,9 @@ jobs:
       - name: Install dependencies
         run: opam install . --deps-only --locked --with-doc
 
+      - name: Install os gem for operating system detection
+        run: sudo gem install os
+
       - name: Build API docs
         run: opam exec -- dune build @doc
 

.github/workflows/locked.yml

@@ -48,6 +48,9 @@ jobs:
       - name: Install dependencies
         run: opam install . --deps-only --locked --with-test
 
+      - name: Install os gem for operating system detection
+        run: sudo gem install os
+
       - name: Build
         run: ./make.sh nat
 
@@ -100,6 +103,9 @@ jobs:
       - name: Install dependencies
         run: opam install . --deps-only --locked --with-test
 
+      - name: Install os gem for operating system detection
+        run: sudo gem install os
+
       - name: Build
         run: ./make.sh nat
 
@@ -142,6 +148,9 @@ jobs:
       - name: Install dependencies
         run: opam install . --deps-only --locked
 
+      - name: Install os gem for operating system detection
+        run: sudo gem install os
+
       - name: Setup Gobview
         run: ./make.sh setup_gobview
 

.github/workflows/unlocked.yml

@@ -57,6 +57,9 @@ jobs:
 
       - name: Install dependencies
         run: opam install . --deps-only --with-test
+
+      - name: Install os gem for operating system detection
+        run: sudo gem install os
 
       - name: Install Apron dependencies
         if: ${{ matrix.apron }}
@@ -118,6 +121,9 @@ jobs:
       - name: Install dependencies
         run: opam install . --deps-only --with-test
 
+      - name: Install os gem for operating system detection
+        run: sudo gem install os
+
       - name: Install Apron dependencies
         run: |
           opam depext apron

make.sh

@@ -90,6 +90,7 @@ rule() {
       # Use `git commit -n` to temporarily bypass the hook if necessary.
       echo "Installing gem parallel (not needed for ./scripts/update_suite.rb -s)"
       sudo gem install parallel
+      sudo gem install os
     ;; headers)
       curl -L -O https://github.com/goblint/linux-headers/archive/master.tar.gz
       tar xf master.tar.gz && rm master.tar.gz

scripts/update_suite.rb

@@ -2,6 +2,7 @@
 
 # gobopt environment variable can be used to override goblint defaults and PARAMs
 
+require 'os'
 require 'find'
 require 'fileutils'
 require 'timeout'
@@ -575,6 +576,8 @@ def run ()
     end
 end
 
+mac = OS.mac?
+
 #processing the file information
 projects = []
 project_ids = Set.new
@@ -603,6 +606,7 @@ def run ()
     lines = IO.readlines(path, :encoding => "UTF-8")
 
     next if not future and only.nil? and lines[0] =~ /SKIP/
+    next if mac and lines[0] =~ /NOMAC/
     next if marshal and lines[0] =~ /NOMARSHAL/
     next if not has_linux_headers and lines[0] =~ /kernel/
     if incremental then

tests/regression/82-barrier/01-simple.c

@@ -1,4 +1,4 @@
-// PARAM: --set ana.activated[+] 'pthreadBarriers'
+// NOMAC PARAM: --set ana.activated[+] 'pthreadBarriers'
 #include<pthread.h>
 #include<stdio.h>
 #include<unistd.h>

tests/regression/82-barrier/02-more.c

@@ -1,4 +1,4 @@
-// PARAM: --set ana.activated[+] 'pthreadBarriers'
+// NOMAC PARAM: --set ana.activated[+] 'pthreadBarriers'
 #include<pthread.h>
 #include<stdio.h>
 #include<unistd.h>

tests/regression/82-barrier/03-problem.c

@@ -1,4 +1,4 @@
-// PARAM: --set ana.activated[+] 'pthreadBarriers'
+// NOMAC PARAM: --set ana.activated[+] 'pthreadBarriers'
 #include<pthread.h>
 #include<stdio.h>
 #include<unistd.h>

tests/regression/82-barrier/04-challenge.c

@@ -1,4 +1,4 @@
-// PARAM: --set ana.activated[+] 'pthreadBarriers'
+// NOMAC PARAM: --set ana.activated[+] 'pthreadBarriers'
 #include<pthread.h>
 #include<stdio.h>
 #include<unistd.h>

tests/regression/82-barrier/05-mhp-not-enough.c

@@ -1,4 +1,4 @@
-// PARAM: --set ana.activated[+] 'pthreadBarriers'
+// NOMAC PARAM: --set ana.activated[+] 'pthreadBarriers'
 #include<pthread.h>
 #include<stdio.h>
 #include<unistd.h>