update test Makefiles in the style of latest nhm-tool (again)

lyokha · Apr 12, 2024 · fc1dec4 · fc1dec4
1 parent 6fd0618
commit fc1dec4
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 7 deletions.
diff --git a/test/Aggregate/Makefile b/test/Aggregate/Makefile
@@ -33,7 +33,8 @@ ifeq ($(INPLACE),1)
 	  $(GHCENV)
 endif
 	sed -i 's/\(^package-id \)/--\1/' $(GHCENV)
-	if ! command -v $(NHMTOOL) >/dev/null; then \
+	if test "$(NHMTOOL)" = nhm-tool && ! command -v nhm-tool >/dev/null; \
+	then \
 	  PATH=$$(dirname \
 	    $$(cabal list-bin $(PKGDISTR) --builddir="$(BUILDDIR)")):$$PATH; \
 	fi; \

diff --git a/test/EDE/Makefile b/test/EDE/Makefile
@@ -33,7 +33,8 @@ ifeq ($(INPLACE),1)
 	  $(GHCENV)
 endif
 	sed -i 's/\(^package-id \)/--\1/' $(GHCENV)
-	if ! command -v $(NHMTOOL) >/dev/null; then \
+	if test "$(NHMTOOL)" = nhm-tool && ! command -v nhm-tool >/dev/null; \
+	then \
 	  PATH=$$(dirname \
 	    $$(cabal list-bin $(PKGDISTR) --builddir="$(BUILDDIR)")):$$PATH; \
 	fi; \

diff --git a/test/PCRE/Makefile b/test/PCRE/Makefile
@@ -33,7 +33,8 @@ ifeq ($(INPLACE),1)
 	  $(GHCENV)
 endif
 	sed -i 's/\(^package-id \)/--\1/' $(GHCENV)
-	if ! command -v $(NHMTOOL) >/dev/null; then \
+	if test "$(NHMTOOL)" = nhm-tool && ! command -v nhm-tool >/dev/null; \
+	then \
 	  PATH=$$(dirname \
 	    $$(cabal list-bin $(PKGDISTR) --builddir="$(BUILDDIR)")):$$PATH; \
 	fi; \

diff --git a/test/Prometheus/Makefile b/test/Prometheus/Makefile
@@ -33,7 +33,8 @@ ifeq ($(INPLACE),1)
 	  $(GHCENV)
 endif
 	sed -i 's/\(^package-id \)/--\1/' $(GHCENV)
-	if ! command -v $(NHMTOOL) >/dev/null; then \
+	if test "$(NHMTOOL)" = nhm-tool && ! command -v nhm-tool >/dev/null; \
+	then \
 	  PATH=$$(dirname \
 	    $$(cabal list-bin $(PKGDISTR) --builddir="$(BUILDDIR)")):$$PATH; \
 	fi; \

diff --git a/test/Resolve/Makefile b/test/Resolve/Makefile
@@ -33,7 +33,8 @@ ifeq ($(INPLACE),1)
 	  $(GHCENV)
 endif
 	sed -i 's/\(^package-id \)/--\1/' $(GHCENV)
-	if ! command -v $(NHMTOOL) >/dev/null; then \
+	if test "$(NHMTOOL)" = nhm-tool && ! command -v nhm-tool >/dev/null; \
+	then \
 	  PATH=$$(dirname \
 	    $$(cabal list-bin $(PKGDISTR) --builddir="$(BUILDDIR)")):$$PATH; \
 	fi; \

diff --git a/test/ServiceHookAdaptor/Makefile b/test/ServiceHookAdaptor/Makefile
@@ -33,7 +33,8 @@ ifeq ($(INPLACE),1)
 	  $(GHCENV)
 endif
 	sed -i 's/\(^package-id \)/--\1/' $(GHCENV)
-	if ! command -v $(NHMTOOL) >/dev/null; then \
+	if test "$(NHMTOOL)" = nhm-tool && ! command -v nhm-tool >/dev/null; \
+	then \
 	  PATH=$$(dirname \
 	    $$(cabal list-bin $(PKGDISTR) --builddir="$(BUILDDIR)")):$$PATH; \
 	fi; \

diff --git a/test/Subrequest/Makefile b/test/Subrequest/Makefile
@@ -33,7 +33,8 @@ ifeq ($(INPLACE),1)
 	  $(GHCENV)
 endif
 	sed -i 's/\(^package-id \)/--\1/' $(GHCENV)
-	if ! command -v $(NHMTOOL) >/dev/null; then \
+	if test "$(NHMTOOL)" = nhm-tool && ! command -v nhm-tool >/dev/null; \
+	then \
 	  PATH=$$(dirname \
 	    $$(cabal list-bin $(PKGDISTR) --builddir="$(BUILDDIR)")):$$PATH; \
 	fi; \