Fix quotation errors in automatically generated testsuite flags

gnustep · Jul 5, 2018 · d13a709 · d13a709
1 parent a0d45d5
commit d13a709
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+2018-07-05  Wolfgang Lux  <wolfgang.lux@gmail.com>
+
+	* Instance/framework.make:
+	* Instance/library.make:
+	Fix quotation errors in automatically generated testsuite flags.
+
 2018-03-22 Richard Frith-Macdonald <rfm@gnu.org>
 
 	* TestFramework/gnustep-tests.in: When invoked with --verbose

diff --git a/Instance/framework.make b/Instance/framework.make
@@ -819,9 +819,9 @@ ifneq ($($(GNUSTEP_INSTANCE)_TEST_DIR),)
 	echo "export LD_LIBRARY_PATH=\"$$(pwd)/$(GNUSTEP_INSTANCE).framework:$(LD_LIBRARY_PATH)\"" > $($(GNUSTEP_INSTANCE)_TEST_DIR)/make-check.env; \
 	echo "# Generated by 'make check'" \
 	  > $($(GNUSTEP_INSTANCE)_TEST_DIR)/make-check.mak; \
-	echo "ADDITIONAL_INCLUDE_DIRS += \"-I$(GNUSTEP_MAKEFILES)/TestFramework -I$(FRAMEWORK_VERSION_DIR)/Headers\"" \
+	echo "ADDITIONAL_INCLUDE_DIRS += \"-I$(GNUSTEP_MAKEFILES)/TestFramework\" \"-I$(FRAMEWORK_VERSION_DIR)/Headers\"" \
 	  >> $($(GNUSTEP_INSTANCE)_TEST_DIR)/make-check.mak; \
-	echo "ADDITIONAL_LDFLAGS += -Wl,-rpath,$$(pwd)/$(GNUSTEP_INSTANCE).framework\"" \ >> $($(GNUSTEP_INSTANCE)_TEST_DIR)/make-check.mak; \
+	echo "ADDITIONAL_LDFLAGS += \"-Wl,-rpath,$$(pwd)/$(GNUSTEP_INSTANCE).framework\"" \ >> $($(GNUSTEP_INSTANCE)_TEST_DIR)/make-check.mak; \
 	echo "ADDITIONAL_LIB_DIRS += \"-L$(FRAMEWORK_VERSION_DIR))\"" \
 	  >> $($(GNUSTEP_INSTANCE)_TEST_DIR)/make-check.mak; \
 	echo "ADDITIONAL_TOOL_LIBS += \"-l$(GNUSTEP_INSTANCE)\"" \

diff --git a/Instance/library.make b/Instance/library.make
@@ -353,9 +353,9 @@ ifneq ($($(GNUSTEP_INSTANCE)_TEST_DIR),)
 	echo "export LD_LIBRARY_PATH=\"$$(pwd)/$(GNUSTEP_OBJ_DIR):$(LD_LIBRARY_PATH)\"" >> $($(GNUSTEP_INSTANCE)_TEST_DIR)/make-check.env; \
 	echo "# Generated by 'make check'" \
 	  > $($(GNUSTEP_INSTANCE)_TEST_DIR)/make-check.mak; \
-	echo "ADDITIONAL_INCLUDE_DIRS += \"-I$(GNUSTEP_MAKEFILES)/TestFramework -I$$(pwd)\"" \
+	echo "ADDITIONAL_INCLUDE_DIRS += \"-I$(GNUSTEP_MAKEFILES)/TestFramework\" \"-I$$(pwd)\"" \
 	  >> $($(GNUSTEP_INSTANCE)_TEST_DIR)/make-check.mak; \
-	echo "ADDITIONAL_LDFLAGS += -Wl,-rpath,$$(pwd)/$(GNUSTEP_OBJ_DIR)\"" \
+	echo "ADDITIONAL_LDFLAGS += \"-Wl,-rpath,$$(pwd)/$(GNUSTEP_OBJ_DIR)\"" \
 	  >> $($(GNUSTEP_INSTANCE)_TEST_DIR)/make-check.mak; \
 	echo "ADDITIONAL_LIB_DIRS += \"-L$$(pwd)/$(GNUSTEP_OBJ_DIR)\"" \
 	  >> $($(GNUSTEP_INSTANCE)_TEST_DIR)/make-check.mak; \