Try to put some tests I made in ONE place. I also moved a test for "install" in one place to try to isolate it.

5 files changed, 66 insertions, 186 deletions

diff --git a/Makefile b/Makefile
index 51b4216..b7926b7 100644
--- a/Makefile
+++ b/Makefile
@@ -35,51 +35,7 @@ PRGDIR  = programs
 TESTDIR = tests
 EXDIR   = examples
 
-
-# Define *.exe as extension for targetting Windows systems
-TARGET_OS ?= $(shell uname)
-ifeq ($(TARGET_OS),)
-  TARGET_OS ?= $(OS)
-endif
-
-ifneq (,$(filter Windows%,$(TARGET_OS)))
-LIBLZ4 = liblz4-$(LIBVER_MAJOR)
-EXT  = .exe
-else
-EXT  = .exe
-ifneq (,$(filter MINGW%,$(TARGET_OS)))
-EXT  = .exe
-else
-ifneq (,$(filter MSYS%,$(TARGET_OS)))
-EXT  = .exe
-else
-ifneq (,$(filter CYGWIN%,$(TARGET_OS)))
-EXT  = .exe
-else
-EXT  =
-endif
-endif
-endif
-endif
-
-#determine if dev/nul based on host environment
-ifneq (,$(filter MINGW%,$(shell uname)))
-VOID := /dev/null
-else
-ifneq (,$(filter MSYS%,$(shell uname)))
-VOID := /dev/null
-else
-ifneq (,$(filter CYGWIN%,$(shell uname)))
-VOID := /dev/null
-else
-ifneq (,$(filter Windows%,$(OS)))
-VOID := nul
-else
-VOID  := /dev/null
-endif
-endif
-endif
-endif
+include Makefile.inc
 
 .PHONY: default
 default: lib-release lz4-release
@@ -128,7 +84,7 @@ clean:
 #-----------------------------------------------------------------------------
 # make install is validated only for Linux, OSX, BSD, Hurd and Solaris targets
 #-----------------------------------------------------------------------------
-ifneq (,$(filter Linux Darwin GNU/kFreeBSD GNU OpenBSD FreeBSD NetBSD DragonFly SunOS Haiku MidnightBSD MINGW32% MINGW64% CYGWIN% MSYS%,$(shell uname)))
+ifeq ($(POSIX_ENV),yes)
 HOST_OS = POSIX
 
 .PHONY: install uninstall
diff --git a/Makefile.inc b/Makefile.inc
new file mode 100644
index 0000000..d9dc891
--- /dev/null
+++ b/Makefile.inc
@@ -0,0 +1,59 @@
+TARGET_OS ?= $(shell uname)
+ifeq ($(TARGET_OS),)
+  TARGET_OS ?= $(OS)
+endif
+
+ifneq (,$(filter Windows%,$(TARGET_OS)))
+LIBLZ4 = liblz4-$(LIBVER_MAJOR)
+LIBLZ4_EXP = liblz4.lib
+WINBASED   = yes
+else
+LIBLZ4_EXP = liblz4.dll.a
+  ifneq (,$(filter MINGW%,$(TARGET_OS)))
+LIBLZ4     = liblz4
+WINBASED   = yes
+  else
+    ifneq (,$(filter MSYS%,$(TARGET_OS)))
+LIBLZ4     = msys-lz4-$(LIBVER_MAJOR)
+WINBASED   = yes
+    else
+      ifneq (,$(filter CYGWIN%,$(TARGET_OS)))
+LIBLZ4     = cyglz4-$(LIBVER_MAJOR)
+WINBASED   = yes
+      else
+LIBLZ4     = liblz4.$(SHARED_EXT_VER)
+WINBASED   = no
+EXT        =
+      endif
+    endif
+  endif
+endif
+
+ifeq ($(WINBASED),yes)
+EXT        = .exe
+endif
+
+#determine if dev/nul based on host environment
+ifneq (,$(filter MINGW%,$(shell uname)))
+VOID := /dev/null
+else
+  ifneq (,$(filter MSYS%,$(shell uname)))
+VOID := /dev/null
+  else
+    ifneq (,$(filter CYGWIN%,$(shell uname)))
+VOID := /dev/null
+    else
+      ifneq (,$(filter Windows%,$(OS)))
+VOID := nul
+      else
+VOID  := /dev/null
+      endif
+    endif
+  endif
+endif
+
+ifneq (,$(filter Linux Darwin GNU/kFreeBSD GNU OpenBSD FreeBSD NetBSD DragonFly SunOS Haiku MidnightBSD MINGW32% MINGW64% CYGWIN% MSYS%,$(shell uname)))
+POSIX_ENV = Yes
+else
+POSIX_ENV = No
+endif
diff --git a/examples/Makefile b/examples/Makefile
index 26aaafd..6a34b33 100644
--- a/examples/Makefile
+++ b/examples/Makefile
@@ -36,53 +36,7 @@ TESTFILE  = Makefile
 LZ4DIR   := ../lib
 LZ4       = ../programs/lz4
 
-
-# Define *.exe as extension for Windows systems
-
-# Define *.exe as extension for targetting Windows systems
-TARGET_OS ?= $(shell uname)
-ifeq ($(TARGET_OS),)
-  TARGET_OS ?= $(OS)
-endif
-
-ifneq (,$(filter Windows%,$(TARGET_OS)))
-LIBLZ4 = liblz4-$(LIBVER_MAJOR)
-EXT  = .exe
-else
-EXT  = .exe
-ifneq (,$(filter MINGW%,$(TARGET_OS)))
-EXT  = .exe
-else
-ifneq (,$(filter MSYS%,$(TARGET_OS)))
-EXT  = .exe
-else
-ifneq (,$(filter CYGWIN%,$(TARGET_OS)))
-EXT  = .exe
-else
-EXT  =
-endif
-endif
-endif
-endif
-
-#determine if dev/nul based on host environment
-ifneq (,$(filter MINGW%,$(shell uname)))
-VOID := /dev/null
-else
-ifneq (,$(filter MSYS%,$(shell uname)))
-VOID := /dev/null
-else
-ifneq (,$(filter CYGWIN%,$(shell uname)))
-VOID := /dev/null
-else
-ifneq (,$(filter Windows%,$(OS)))
-VOID := nul
-else
-VOID  := /dev/null
-endif
-endif
-endif
-endif
+include ../Makefile.inc
 
 default: all
 
diff --git a/lib/Makefile b/lib/Makefile
index 4e96b57..0546031 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -45,10 +45,6 @@ LIBVER  := $(shell echo $(LIBVER_SCRIPT))
 BUILD_SHARED:=yes
 BUILD_STATIC:=yes
 
-TARGET_OS ?= $(shell uname)
-ifeq ($(TARGET_OS),)
-  TARGET_OS ?= $(OS)
-endif
 CPPFLAGS+= -DXXH_NAMESPACE=LZ4_
 CFLAGS  ?= -O3
 DEBUGFLAGS:= -Wall -Wextra -Wcast-qual -Wcast-align -Wshadow \
@@ -74,27 +70,7 @@ else
 	SHARED_EXT_VER = $(SHARED_EXT).$(LIBVER)
 endif
 
-WINBASED = yes
-ifneq (,$(filter Windows%,$(TARGET_OS)))
-LIBLZ4 = liblz4-$(LIBVER_MAJOR)
-LIBLZ4_EXP = liblz4.lib
-else
-LIBLZ4_EXP = liblz4.dll.a
-ifneq (,$(filter MINGW%,$(TARGET_OS)))
-LIBLZ4 = liblz4
-else
-ifneq (,$(filter MSYS%,$(TARGET_OS)))
-LIBLZ4 = msys-lz4-$(LIBVER_MAJOR)
-else
-ifneq (,$(filter CYGWIN%,$(TARGET_OS)))
-LIBLZ4 = cyglz4-$(LIBVER_MAJOR)
-else
-LIBLZ4 = liblz4.$(SHARED_EXT_VER)
-WINBASED = no
-endif
-endif
-endif
-endif
+include ../Makefile.inc
 
 .PHONY: default
 default: lib-release
@@ -147,7 +123,7 @@ clean:
 #-----------------------------------------------------------------------------
 # make install is validated only for Linux, OSX, BSD, Hurd and Solaris targets
 #-----------------------------------------------------------------------------
-ifneq (,$(filter Linux Darwin GNU/kFreeBSD GNU OpenBSD FreeBSD NetBSD DragonFly SunOS Haiku MidnightBSD MINGW32_NT% MINGW64_NT% MSYS% CYGWIN_NT%,$(shell uname)))
+ifeq ($(POSIX_ENV),yes)
 
 .PHONY: listL120
 listL120:  # extract lines >= 120 characters in *.{c,h}, by Takayuki Matsuoka (note : $$, for Makefile compatibility)
diff --git a/tests/Makefile b/tests/Makefile
index d8104de..b9afb02 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -43,71 +43,7 @@ CFLAGS  += $(DEBUGFLAGS) $(MOREFLAGS)
 CPPFLAGS+= -I$(LZ4DIR) -I$(PRGDIR) -DXXH_NAMESPACE=LZ4_
 FLAGS    = $(CFLAGS) $(CPPFLAGS) $(LDFLAGS)
 
-# Define *.exe as extension for Windows systems
-TARGET_OS ?= $(shell uname)
-ifeq ($(TARGET_OS),)
-  TARGET_OS ?= $(OS)
-endif
-
-ifneq (,$(filter Windows%,$(TARGET_OS)))
-EXT  :=.exe
-else
-ifneq (,$(filter MINGW%,$(TARGET_OS)))
-EXT  :=.exe
-else
-ifneq (,$(filter MSYS%,$(TARGET_OS)))
-EXT  :=.exe
-else
-ifneq (,$(filter CYGWIN%,$(TARGET_OS)))
-EXT  :=.exe
-else
-EXT  :=
-endif
-endif
-endif
-endif
-
-# determine name of .DLL for the target
-WINBASED = yes
-ifneq (,$(filter Windows%,$(TARGET_OS)))
-LIBLZ4 = liblz4-$(LIBVER_MAJOR)
-LIBLZ4_EXP = liblz4.lib
-else
-LIBLZ4_EXP = liblz4.dll.a
-ifneq (,$(filter MINGW%,$(TARGET_OS)))
-LIBLZ4 = liblz4
-else
-ifneq (,$(filter MSYS%,$(TARGET_OS)))
-LIBLZ4 = msys-lz4-$(LIBVER_MAJOR)
-else
-ifneq (,$(filter CYGWIN%,$(TARGET_OS)))
-LIBLZ4 = cyglz4-$(LIBVER_MAJOR)
-else
-LIBLZ4 = liblz4.$(SHARED_EXT_VER)
-WINBASED = no
-endif
-endif
-endif
-endif
-
-#determine if dev/nul based on host environment
-ifneq (,$(filter MINGW%,$(shell uname)))
-VOID := /dev/null
-else
-ifneq (,$(filter MSYS%,$(shell uname)))
-VOID := /dev/null
-else
-ifneq (,$(filter CYGWIN%,$(shell uname)))
-VOID := /dev/null
-else
-ifneq (,$(filter Windows%,$(OS)))
-VOID := nul
-else
-VOID  := /dev/null
-endif
-endif
-endif
-endif
+include ../Makefile.inc
 
 LZ4 := $(PRGDIR)/lz4$(EXT)
 
@@ -117,7 +53,6 @@ TEST_FILES   := COPYING
 FUZZER_TIME  := -T90s
 NB_LOOPS     ?= -i1
 
-
 default: all
 
 all: fullbench fuzzer frametest roundTripTest datagen checkFrame
@@ -194,7 +129,7 @@ checkTag: checkTag.c $(LZ4DIR)/lz4.h
 #-----------------------------------------------------------------------------
 # validated only for Linux, OSX, BSD, Hurd and Solaris targets
 #-----------------------------------------------------------------------------
-ifneq (,$(filter Linux Darwin GNU/kFreeBSD GNU OpenBSD FreeBSD NetBSD DragonFly SunOS Haiku MidnightBSD MINGW32% MINGW64% CYGWIN% MSYS%,$(shell uname)))
+ifeq ($(POSIX_ENV),yes)
 
 MD5:=md5sum
 ifneq (,$(filter $(shell uname), Darwin ))