diff options
| author | Neil <nyamatongwe@gmail.com> | 2022-02-10 13:57:56 +1100 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2022-02-10 13:57:56 +1100 |
| commit | 9b8ca41b15ca4f53c0f1ccd69e6135694321d854 (patch) | |
| tree | f524caae34d6552e6fe3d604cafd1c37f6dd459f /test | |
| parent | 98bdc254f4f654b9e9191d4684d4c8fe7c953cfe (diff) | |
| download | scintilla-mirror-9b8ca41b15ca4f53c0f1ccd69e6135694321d854.tar.gz | |
Replace "OS X' with "macOS".
Diffstat (limited to 'test')
| -rw-r--r-- | test/unit/README | 4 | ||||
| -rw-r--r-- | test/unit/makefile | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/test/unit/README b/test/unit/README index 2558d8e86..87b660108 100644 --- a/test/unit/README +++ b/test/unit/README @@ -1,11 +1,11 @@ The test/unit directory contains unit tests for Scintilla data structures. -The tests can be run on Windows, OS X, or Linux using g++ and GNU make. +The tests can be run on Windows, macOS, or Linux using g++ and GNU make. The Catch test framework is used. https://github.com/philsquared/Catch The file catch.hpp is under the Boost Software License which is contained in LICENSE_1_0.txt - To run the tests on OS X or Linux: + To run the tests on macOS or Linux: make test To run the tests on Windows: diff --git a/test/unit/makefile b/test/unit/makefile index 572ea1443..89766826f 100644 --- a/test/unit/makefile +++ b/test/unit/makefile @@ -1,6 +1,6 @@ # Build all the unit tests using GNU make and either g++ or clang # Should be run using mingw32-make on Windows, not nmake -# On Windows g++ is used, on OS X clang, and on Linux G++ is used by default +# On Windows g++ is used, on macOS clang, and on Linux G++ is used by default # but clang can be used by defining CLANG when invoking make # clang works only with libc++, not libstdc++ # Tested with clang 9 and g++ 9 @@ -9,7 +9,7 @@ CXXSTD=c++17 ifndef windir ifeq ($(shell uname),Darwin) -# On OS X always use clang as g++ is old version +# On macOS (detected with Darwin uname) always use clang as g++ is old version CLANG = 1 USELIBCPP = 1 endif @@ -22,7 +22,7 @@ ifdef CLANG CXX = clang++ CXXFLAGS += -D_CRT_SECURE_NO_DEPRECATE ifdef USELIBCPP -# OS X, use libc++ but don't have sanitizers +# macOS, use libc++ but don't have sanitizers CXXFLAGS += --stdlib=libc++ LINKFLAGS = -lc++ else |