Skip to content

Commit 4f84963

Browse files
committed
regression/*/Makefile: consistently use BUILD_ENV_ to detect platform
There is no need to re-implement logic that src/common already takes care of. Also, we identify Visual Studio in that way, so shouldn't deviate from this for another platform.
1 parent 164eea5 commit 4f84963

File tree

4 files changed

+12
-16
lines changed

4 files changed

+12
-16
lines changed

regression/ansi-c/Makefile

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,14 @@ endif
1212
ifeq ($(BUILD_ENV_),MSVC)
1313
excluded_tests = -X gcc-only
1414
else
15+
ifeq ($(BUILD_ENV_),OSX)
1516
# In MacOS, a change in the assert.h header file
1617
# is causing template errors when exercising the
1718
# C++ front end (because of a transitive include
1819
# of <type_traits>) for files that include the
1920
# <assert.h> or <cassert> headers.
20-
OS := $(shell uname)
21-
ifeq ($(OS),Darwin)
22-
excluded_tests = -X macos-assert-broken
23-
endif
21+
excluded_tests = -X macos-assert-broken
22+
endif
2423
endif
2524

2625
test:

regression/cbmc-cpp/Makefile

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,14 @@ include ../../src/common
66
ifeq ($(BUILD_ENV_),MSVC)
77
excluded_tests = -X gcc-only -X winbug
88
else
9+
ifeq ($(BUILD_ENV_),OSX)
910
# In MacOS, a change in the assert.h header file
1011
# is causing template errors when exercising the
1112
# C++ front end (because of a transitive include
1213
# of <type_traits>) for files that include the
1314
# <assert.h> or <cassert> headers.
14-
OS := $(shell uname)
15-
ifeq ($(OS),Darwin)
16-
excluded_tests = -X macos-assert-broken
17-
endif
15+
excluded_tests = -X macos-assert-broken
16+
endif
1817
endif
1918

2019
test:

regression/cpp/Makefile

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,14 @@ endif
1212
ifeq ($(BUILD_ENV_),MSVC)
1313
excluded_tests = -X gcc-only -X winbug
1414
else
15+
ifeq ($(BUILD_ENV_),OSX)
1516
# In MacOS, a change in the assert.h header file
1617
# is causing template errors when exercising the
1718
# C++ front end (because of a transitive include
1819
# of <type_traits>) for files that include the
1920
# <assert.h> or <cassert> headers.
20-
OS := $(shell uname)
21-
ifeq ($(OS),Darwin)
22-
excluded_tests = -X macos-assert-broken
23-
endif
21+
excluded_tests = -X macos-assert-broken
22+
endif
2423
endif
2524

2625
test:

regression/systemc/Makefile

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,14 @@ endif
1212
ifeq ($(BUILD_ENV_),MSVC)
1313
excluded_tests = -X gcc-only -X winbug
1414
else
15+
ifeq ($(BUILD_ENV_),OSX)
1516
# In MacOS, a change in the assert.h header file
1617
# is causing template errors when exercising the
1718
# C++ front end (because of a transitive include
1819
# of <type_traits>) for files that include the
1920
# <assert.h> or <cassert> headers.
20-
OS := $(shell uname)
21-
ifeq ($(OS),Darwin)
22-
excluded_tests = -X macos-assert-broken
23-
endif
21+
excluded_tests = -X macos-assert-broken
22+
endif
2423
endif
2524

2625
default: tests.log

0 commit comments

Comments
 (0)