File tree Expand file tree Collapse file tree 4 files changed +12
-16
lines changed
Expand file tree Collapse file tree 4 files changed +12
-16
lines changed Original file line number Diff line number Diff line change @@ -12,15 +12,14 @@ endif
1212ifeq ($(BUILD_ENV_ ) ,MSVC)
1313 excluded_tests = -X gcc-only
1414else
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
2423endif
2524
2625test :
Original file line number Diff line number Diff line change @@ -6,15 +6,14 @@ include ../../src/common
66ifeq ($(BUILD_ENV_ ) ,MSVC)
77 excluded_tests = -X gcc-only -X winbug
88else
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
1817endif
1918
2019test :
Original file line number Diff line number Diff line change @@ -12,15 +12,14 @@ endif
1212ifeq ($(BUILD_ENV_ ) ,MSVC)
1313 excluded_tests = -X gcc-only -X winbug
1414else
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
2423endif
2524
2625test :
Original file line number Diff line number Diff line change @@ -12,15 +12,14 @@ endif
1212ifeq ($(BUILD_ENV_ ) ,MSVC)
1313 excluded_tests = -X gcc-only -X winbug
1414else
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
2423endif
2524
2625default : tests.log
You can’t perform that action at this time.
0 commit comments