diff options
| author | Loïc Hoguin <[email protected]> | 2015-09-27 23:20:28 +0200 |
|---|---|---|
| committer | Loïc Hoguin <[email protected]> | 2015-09-27 23:20:28 +0200 |
| commit | 41ea5e7fe740625899cd9553f5d9faf25cf5425a (patch) | |
| tree | 1ce98927ab01682b65fd70cdca259d9a59ea13f1 /test | |
| parent | 003ed2490a9c1212ab1de245822c7d263a21aedb (diff) | |
| download | erlang.mk-41ea5e7fe740625899cd9553f5d9faf25cf5425a.tar.gz erlang.mk-41ea5e7fe740625899cd9553f5d9faf25cf5425a.tar.bz2 erlang.mk-41ea5e7fe740625899cd9553f5d9faf25cf5425a.zip | |
Improve tests' platform detection
Fixes a small warning printed on OSX, and don't run a specific
test on FreeBSD (compiles a C library not compatible with FreeBSD).
Diffstat (limited to 'test')
| -rw-r--r-- | test/Makefile | 14 | ||||
| -rw-r--r-- | test/core_deps.mk | 2 |
2 files changed, 12 insertions, 4 deletions
diff --git a/test/Makefile b/test/Makefile index fffc171..9272832 100644 --- a/test/Makefile +++ b/test/Makefile @@ -19,12 +19,18 @@ APP_TO_CLEAN = $(subst -,_,$(patsubst clean-%,%,$@)) ERL = erl +A0 -noinput -boot start_clean -# Platform, condensed version. +# Platform detection, condensed version. -ifeq ($(shell uname -o),Msys) - PLATFORM = msys2 +UNAME_S := $(shell uname -s) + +ifeq ($(UNAME_S),Darwin) +PLATFORM = darwin +else ifeq ($(UNAME_S),FreeBSD) +PLATFORM = freebsd +else ifeq ($(shell uname -o),Msys) +PLATFORM = msys2 else - PLATFORM = unix +PLATFORM = unix endif # Some systems do not have sub-second file times resolution. diff --git a/test/core_deps.mk b/test/core_deps.mk index b9e3d85..4eb5924 100644 --- a/test/core_deps.mk +++ b/test/core_deps.mk @@ -41,6 +41,7 @@ core-deps-build-c-8cc: build clean-core-deps-build-c-8cc halt()" endif +ifneq ($(PLATFORM),freebsd) core-deps-build-c-imagejs: build clean-core-deps-build-c-imagejs $i "Bootstrap a new OTP library named $(APP)" @@ -67,6 +68,7 @@ core-deps-build-c-imagejs: build clean-core-deps-build-c-imagejs {ok, Deps} = application:get_key($(APP), applications), \ false = lists:member(imagejs, Deps), \ halt()" +endif core-deps-build-erl: build clean-core-deps-build-erl |