Fix passing CC to maketest.py when CC has arguments.

DiamondLovesYou · DiamondLovesYou · commit 43cc6d465251 · 2015-08-31T19:17:31.000-05:00
rmake: Get all tests passing on MSVC (thanks Alex!).

For example, I configure with CC="ccache /usr/lib/icecc/bin/gcc".
diff --git a/mk/tests.mk b/mk/tests.mk
@@ -1046,6 +1046,10 @@ $$(call TEST_OK_FILE,$(1),$(2),$(3),rmake): \
 		$$(RMAKE_TESTS:%=$(3)/test/run-make/%-$(1)-T-$(2)-H-$(3).ok)
 	@touch $$@
 
+$(3)/test/run-make/%-$(1)-T-$(2)-H-$(3).ok: \
+	export INCLUDE := $$(CFG_MSVC_INCLUDE_PATH_$$(HOST_$(3)))
+$(3)/test/run-make/%-$(1)-T-$(2)-H-$(3).ok: \
+	export LIB := $$(CFG_MSVC_LIB_PATH_$$(HOST_$(3)))
 $(3)/test/run-make/%-$(1)-T-$(2)-H-$(3).ok: \
 		$(S)src/test/run-make/%/Makefile \
 		$$(CSREQ$(1)_T_$(2)_H_$(3))
@@ -1056,15 +1060,16 @@ $(3)/test/run-make/%-$(1)-T-$(2)-H-$(3).ok: \
         $$(MAKE) \
 	    $$(HBIN$(1)_H_$(3))/rustc$$(X_$(3)) \
 	    $(3)/test/run-make/$$* \
-	    "$$(CC_$(3))" \
+	    '$$(CC_$(3))' \
 	    "$$(CFG_GCCISH_CFLAGS_$(3))" \
 	    $$(HBIN$(1)_H_$(3))/rustdoc$$(X_$(3)) \
 	    "$$(TESTNAME)" \
 	    $$(LD_LIBRARY_PATH_ENV_NAME$(1)_T_$(2)_H_$(3)) \
 	    "$$(LD_LIBRARY_PATH_ENV_HOSTDIR$(1)_T_$(2)_H_$(3))" \
 	    "$$(LD_LIBRARY_PATH_ENV_TARGETDIR$(1)_T_$(2)_H_$(3))" \
 	    $(1) \
-	    $$(S)
+	    $$(S) \
+	    $(3)
 	@touch -r $$@.start_time $$@ && rm $$@.start_time
 else
 # FIXME #11094 - The above rule doesn't work right for multiple targets
diff --git a/src/etc/maketest.py b/src/etc/maketest.py
@@ -12,6 +12,7 @@
 import os
 import sys
 
+target_triple = sys.argv[14]
 
 def normalize_path(v):
     """msys1/msys2 automatically converts `/abs/path1:/abs/path2` into
@@ -22,8 +23,11 @@ def normalize_path(v):
     windows paths so it is really error-prone. revert it for peace."""
     v = v.replace('\\', '/')
     # c:/path -> /c/path
-    if ':/' in v:
-        v = '/' + v.replace(':/', '/')
+    # "c:/path" -> "/c/path"
+    start = v.find(':/')
+    while start != -1:
+        v = v[:start - 1] + '/' + v[start - 1:start] + v[start + 1:]
+        start = v.find(':/')
     return v
 
 
@@ -50,6 +54,10 @@ def convert_path_spec(name, value):
 putenv('RUST_BUILD_STAGE', sys.argv[12])
 putenv('S', os.path.abspath(sys.argv[13]))
 putenv('PYTHON', sys.executable)
+os.putenv('TARGET', target_triple)
+
+if 'msvc' in target_triple:
+    os.putenv('IS_MSVC', '1')
 
 if filt not in sys.argv[1]:
     sys.exit(0)
diff --git a/src/test/run-make/archive-duplicate-names/Makefile b/src/test/run-make/archive-duplicate-names/Makefile
@@ -3,8 +3,8 @@
 all:
 	mkdir $(TMPDIR)/a
 	mkdir $(TMPDIR)/b
-	$(CC) -c -o $(TMPDIR)/a/foo.o foo.c
-	$(CC) -c -o $(TMPDIR)/b/foo.o bar.c
+	$(call COMPILE_OBJ,$(TMPDIR)/a/foo.o,foo.c)
+	$(call COMPILE_OBJ,$(TMPDIR)/b/foo.o,bar.c)
 	ar crus $(TMPDIR)/libfoo.a $(TMPDIR)/a/foo.o $(TMPDIR)/b/foo.o
 	$(RUSTC) foo.rs
 	$(RUSTC) bar.rs
diff --git a/src/test/run-make/c-dynamic-dylib/cfoo.c b/src/test/run-make/c-dynamic-dylib/cfoo.c
@@ -1,2 +1,5 @@
 // ignore-license
+#ifdef _WIN32
+__declspec(dllexport)
+#endif
 int foo() { return 0; }
diff --git a/src/test/run-make/c-dynamic-rlib/cfoo.c b/src/test/run-make/c-dynamic-rlib/cfoo.c
@@ -1,2 +1,6 @@
 // ignore-license
+
+#ifdef _WIN32
+__declspec(dllexport)
+#endif
 int foo() { return 0; }
diff --git a/src/test/run-make/c-link-to-rust-dylib/Makefile b/src/test/run-make/c-link-to-rust-dylib/Makefile
@@ -1,10 +1,17 @@
 -include ../tools.mk
 
-HOST_LIB_DIR=$(TMPDIR)/../../../stage$(RUST_BUILD_STAGE)/lib
-
-all:
-	$(RUSTC) foo.rs
-	$(CC) bar.c -lfoo -o $(call RUN_BINFILE,bar) $(call RPATH_LINK_SEARCH,$(HOST_LIB_DIR)) -Wl,-rpath,$(TMPDIR) $(EXTRACFLAGS)
+all: $(TMPDIR)/$(call BIN,bar)
 	$(call RUN,bar)
 	$(call REMOVE_DYLIBS,foo)
 	$(call FAIL,bar)
+
+ifdef IS_MSVC
+$(TMPDIR)/$(call BIN,bar): $(call DYLIB,foo)
+	$(CC) bar.c $(TMPDIR)/foo.lib $(call OUT_EXE,bar)
+else
+$(TMPDIR)/$(call BIN,bar): $(call DYLIB,foo)
+	$(CC) bar.c -lfoo -o $(call RUN_BINFILE,bar) -L $(TMPDIR)
+endif
+
+$(call DYLIB,foo): foo.rs
+	$(RUSTC) foo.rs
diff --git a/src/test/run-make/c-link-to-rust-staticlib/Makefile b/src/test/run-make/c-link-to-rust-staticlib/Makefile
@@ -1,12 +1,11 @@
 -include ../tools.mk
 
-EXTRAFLAGS := $(EXTRACFLAGS)
-
 # FIXME: ignore freebsd
 ifneq ($(shell uname),FreeBSD)
 all:
 	$(RUSTC) foo.rs
-	$(CC) bar.c -lfoo -o $(call RUN_BINFILE,bar) $(EXTRAFLAGS) $(EXTRACXXFLAGS)
+	$(CC) bar.c $(TMPDIR)/libfoo.a $(call OUT_EXE,bar) \
+		$(EXTRACFLAGS) $(EXTRACXXFLAGS)
 	$(call RUN,bar)
 	rm $(call STATICLIB,foo*)
 	$(call RUN,bar)
diff --git a/src/test/run-make/c-static-dylib/Makefile b/src/test/run-make/c-static-dylib/Makefile
@@ -1,9 +1,9 @@
 -include ../tools.mk
 
-all: $(call STATICLIB,cfoo)
+all: $(call NATIVE_STATICLIB,cfoo)
 	$(RUSTC) foo.rs -C prefer-dynamic
 	$(RUSTC) bar.rs
-	rm $(TMPDIR)/$(call STATICLIB_GLOB,cfoo)
+	rm $(call NATIVE_STATICLIB,cfoo)
 	$(call RUN,bar)
 	$(call REMOVE_DYLIBS,foo)
 	$(call FAIL,bar)
diff --git a/src/test/run-make/c-static-rlib/Makefile b/src/test/run-make/c-static-rlib/Makefile
@@ -1,8 +1,8 @@
 -include ../tools.mk
 
-all: $(call STATICLIB,cfoo)
+all: $(call NATIVE_STATICLIB,cfoo)
 	$(RUSTC) foo.rs
 	$(RUSTC) bar.rs
 	$(call REMOVE_RLIBS,foo)
-	rm $(TMPDIR)/$(call STATICLIB_GLOB,cfoo)
+	rm $(call NATIVE_STATICLIB,cfoo)
 	$(call RUN,bar)
diff --git a/src/test/run-make/crate-name-priority/Makefile b/src/test/run-make/crate-name-priority/Makefile
@@ -7,5 +7,5 @@ all:
 	rm $(TMPDIR)/$(call BIN,bar)
 	$(RUSTC) foo1.rs
 	rm $(TMPDIR)/$(call BIN,foo)
-	$(RUSTC) foo1.rs -o $(TMPDIR)/bar1
+	$(RUSTC) foo1.rs -o $(TMPDIR)/$(call BIN,bar1)
 	rm $(TMPDIR)/$(call BIN,bar1)
diff --git a/src/test/run-make/extern-fn-generic/Makefile b/src/test/run-make/extern-fn-generic/Makefile
@@ -1,8 +1,6 @@
 -include ../tools.mk
 
-all:
-	$(CC) -std=c99 test.c -c -o $(TMPDIR)/test.o
-	$(AR) rcs $(TMPDIR)/libtest.a $(TMPDIR)/test.o
-	$(RUSTC) testcrate.rs -L $(TMPDIR)
-	$(RUSTC) test.rs -L $(TMPDIR)
+all: $(call NATIVE_STATICLIB,test)
+	$(RUSTC) testcrate.rs
+	$(RUSTC) test.rs
 	$(call RUN,test) || exit 1
diff --git a/src/test/run-make/extern-fn-mangle/Makefile b/src/test/run-make/extern-fn-mangle/Makefile
@@ -1,7 +1,5 @@
 -include ../tools.mk
 
-all:
-	$(CC) -std=c99 test.c -c -o $(TMPDIR)/test.o
-	$(AR) rcs $(TMPDIR)/libtest.a $(TMPDIR)/test.o
-	$(RUSTC) test.rs -L $(TMPDIR)
+all: $(call NATIVE_STATICLIB,test)
+	$(RUSTC) test.rs
 	$(call RUN,test) || exit 1
diff --git a/src/test/run-make/extern-fn-with-packed-struct/Makefile b/src/test/run-make/extern-fn-with-packed-struct/Makefile
@@ -1,7 +1,5 @@
 -include ../tools.mk
 
-all:
-	$(CC) -std=c99 test.c -c -o $(TMPDIR)/test.o
-	$(AR) rcs $(TMPDIR)/libtest.a $(TMPDIR)/test.o
-	$(RUSTC) test.rs -L $(TMPDIR)
+all: $(call NATIVE_STATICLIB,test)
+	$(RUSTC) test.rs
 	$(call RUN,test) || exit 1
diff --git a/src/test/run-make/extern-fn-with-packed-struct/test.c b/src/test/run-make/extern-fn-with-packed-struct/test.c
@@ -1,11 +1,21 @@
 // ignore-license
 // Pragma needed cause of gcc bug on windows: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=52991
+
+#ifdef _MSC_VER
+#pragma pack(push,1)
+struct Foo {
+    char a;
+    short b;
+    char c;
+};
+#else
 #pragma pack(1)
 struct __attribute__((packed)) Foo {
     char a;
     short b;
     char c;
 };
+#endif
 
 struct Foo foo(struct Foo foo) {
     return foo;
diff --git a/src/test/run-make/extern-fn-with-union/Makefile b/src/test/run-make/extern-fn-with-union/Makefile
@@ -1,8 +1,6 @@
 -include ../tools.mk
 
-all:
-	$(CC) -std=c99 test.c -c -o $(TMPDIR)/test.o
-	$(AR) rcs $(TMPDIR)/libtest.a $(TMPDIR)/test.o
-	$(RUSTC) testcrate.rs -L $(TMPDIR)
-	$(RUSTC) test.rs -L $(TMPDIR)
+all: $(call NATIVE_STATICLIB,test)
+	$(RUSTC) testcrate.rs
+	$(RUSTC) test.rs
 	$(call RUN,test) || exit 1
diff --git a/src/test/run-make/interdependent-c-libraries/Makefile b/src/test/run-make/interdependent-c-libraries/Makefile
@@ -8,7 +8,7 @@
 # correct to complete the linkage. If passed as "-lfoo -lbar", then the 'foo'
 # library will be stripped out, and the linkage will fail.
 
-all: $(call STATICLIB,foo) $(call STATICLIB,bar)
+all: $(call NATIVE_STATICLIB,foo) $(call NATIVE_STATICLIB,bar)
 	$(RUSTC) foo.rs
 	$(RUSTC) bar.rs
 	$(RUSTC) main.rs -Z print-link-args
diff --git a/src/test/run-make/issue-12446/Makefile b/src/test/run-make/issue-12446/Makefile
@@ -1,6 +1,6 @@
 -include ../tools.mk
 
-all: $(call STATICLIB,foo)
+all: $(call NATIVE_STATICLIB,foo)
 	$(RUSTC) foo.rs
 	$(RUSTC) bar.rs
 	$(call RUN,bar)
diff --git a/src/test/run-make/issue-14500/Makefile b/src/test/run-make/issue-14500/Makefile
@@ -13,5 +13,5 @@ endif
 all:
 	$(RUSTC) foo.rs --crate-type=rlib
 	$(RUSTC) bar.rs --crate-type=staticlib -C lto -L. -o $(TMPDIR)/libbar.a
-	$(CC) foo.c -lbar -o $(call RUN_BINFILE,foo) $(EXTRACFLAGS)
+	$(CC) foo.c $(TMPDIR)/libbar.a $(EXTRACFLAGS) $(call OUT_EXE,foo)
 	$(call RUN,foo)
diff --git a/src/test/run-make/issue-15460/Makefile b/src/test/run-make/issue-15460/Makefile
@@ -1,6 +1,6 @@
 -include ../tools.mk
 
-all: $(TMPDIR)/libfoo.a
+all: $(call NATIVE_STATICLIB,foo)
 	$(RUSTC) foo.rs -C extra-filename=-383hf8 -C prefer-dynamic
 	$(RUSTC) bar.rs
 	$(call RUN,bar)
diff --git a/src/test/run-make/issue-15460/foo.c b/src/test/run-make/issue-15460/foo.c
@@ -1,2 +1,6 @@
 // ignore-license
+
+#ifdef _WIN32
+__declspec(dllexport)
+#endif
 void foo() {}
diff --git a/src/test/run-make/issue-15460/foo.rs b/src/test/run-make/issue-15460/foo.rs
@@ -8,9 +8,11 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+#![feature(linked_from)]
 #![crate_type = "dylib"]
 
 #[link(name = "foo", kind = "static")]
+#[linked_from = "foo"]
 extern {
     pub fn foo();
 }
diff --git a/src/test/run-make/issue-25581/Makefile b/src/test/run-make/issue-25581/Makefile
@@ -1,7 +1,5 @@
 -include ../tools.mk
 
-all:
-	$(CC) -std=c99 test.c -c -o $(TMPDIR)/test.o
-	$(AR) rcs $(TMPDIR)/libtest.a $(TMPDIR)/test.o
-	$(RUSTC) test.rs -L $(TMPDIR)
+all: $(call NATIVE_STATICLIB,test)
+	$(RUSTC) test.rs
 	$(call RUN,test) || exit 1
diff --git a/src/test/run-make/issue-26092/Makefile b/src/test/run-make/issue-26092/Makefile
@@ -1,5 +1,5 @@
 -include ../tools.mk
 
 all:
-		$(RUSTC) -o "" blank.rs 2>&1 | \
-			grep 'No such file or directory'
+		$(BARE_RUSTC) -o "" blank.rs 2>&1 | \
+			grep -i 'No such file or directory'
diff --git a/src/test/run-make/link-path-order/Makefile b/src/test/run-make/link-path-order/Makefile
@@ -6,10 +6,12 @@
 CORRECT_DIR=$(TMPDIR)/correct
 WRONG_DIR=$(TMPDIR)/wrong
 
-all: $(TMPDIR)/libcorrect.a $(TMPDIR)/libwrong.a
+F := $(call NATIVE_STATICLIB_FILE,foo)
+
+all: $(call NATIVE_STATICLIB,correct) $(call NATIVE_STATICLIB,wrong)
 	mkdir -p $(CORRECT_DIR) $(WRONG_DIR)
-	mv $(TMPDIR)/libcorrect.a $(CORRECT_DIR)/libfoo.a
-	mv $(TMPDIR)/libwrong.a $(WRONG_DIR)/libfoo.a
+	mv $(call NATIVE_STATICLIB,correct) $(CORRECT_DIR)/$(F)
+	mv $(call NATIVE_STATICLIB,wrong) $(WRONG_DIR)/$(F)
 	$(RUSTC) main.rs -o $(TMPDIR)/should_succeed -L $(CORRECT_DIR) -L $(WRONG_DIR)
 	$(call RUN,should_succeed)
 	$(RUSTC) main.rs -o $(TMPDIR)/should_fail -L $(WRONG_DIR) -L $(CORRECT_DIR)
diff --git a/src/test/run-make/linkage-attr-on-static/Makefile b/src/test/run-make/linkage-attr-on-static/Makefile
@@ -1,7 +1,5 @@
 -include ../tools.mk
 
-all:
-	$(CC) foo.c -c -o $(TMPDIR)/foo.o
-	$(AR) rcs $(TMPDIR)/libfoo.a $(TMPDIR)/foo.o
-	$(RUSTC) bar.rs -lfoo -L $(TMPDIR)
+all: $(call NATIVE_STATICLIB,foo)
+	$(RUSTC) bar.rs
 	$(call RUN,bar) || exit 1
diff --git a/src/test/run-make/linkage-attr-on-static/bar.rs b/src/test/run-make/linkage-attr-on-static/bar.rs
@@ -14,6 +14,7 @@
 #[linkage = "external"]
 static BAZ: i32 = 21;
 
+#[link(name = "foo", kind = "static")]
 extern {
     fn what() -> i32;
 }
diff --git a/src/test/run-make/lto-smoke-c/Makefile b/src/test/run-make/lto-smoke-c/Makefile
@@ -5,5 +5,7 @@ CC := $(CC:-g=)
 
 all:
 	$(RUSTC) foo.rs -C lto
-	$(CC) bar.c -lfoo -o $(call RUN_BINFILE,bar) $(EXTRACFLAGS) $(EXTRACXXFLAGS)
+	$(CC) bar.c $(TMPDIR)/libfoo.a \
+		$(call OUT_EXE,bar) \
+		$(EXTRACFLAGS) $(EXTRACXXFLAGS)
 	$(call RUN,bar)
diff --git a/src/test/run-make/no-duplicate-libs/Makefile b/src/test/run-make/no-duplicate-libs/Makefile
@@ -1,7 +1,12 @@
 -include ../tools.mk
 
+ifdef IS_MSVC
+# FIXME(#27979)
+all:
+else
 all:
 	$(RUSTC) foo.rs
 	$(RUSTC) bar.rs
 	$(RUSTC) main.rs
 	$(call RUN,main)
+endif
diff --git a/src/test/run-make/no-duplicate-libs/bar.c b/src/test/run-make/no-duplicate-libs/bar.c
diff --git a/src/test/run-make/no-duplicate-libs/foo.c b/src/test/run-make/no-duplicate-libs/foo.c
diff --git a/src/test/run-make/output-type-permutations/Makefile b/src/test/run-make/output-type-permutations/Makefile
@@ -5,6 +5,7 @@ all:
 	$(call REMOVE_RLIBS,bar)
 	$(call REMOVE_DYLIBS,bar)
 	rm $(TMPDIR)/$(call STATICLIB_GLOB,bar)
+	rm -f $(TMPDIR)/bar.{exp,lib}
 	# Check that $(TMPDIR) is empty.
 	[ "$$(ls -1 $(TMPDIR) | wc -l)" -eq "0" ]
 
@@ -36,23 +37,24 @@ all:
 	rm $(TMPDIR)/foo
 	[ "$$(ls -1 $(TMPDIR) | wc -l)" -eq "0" ]
 
-	$(RUSTC) foo.rs --emit=link -o $(TMPDIR)/foo
+	$(RUSTC) foo.rs --emit=link -o $(TMPDIR)/$(call BIN,foo)
 	rm $(TMPDIR)/$(call BIN,foo)
 	[ "$$(ls -1 $(TMPDIR) | wc -l)" -eq "0" ]
 
 	$(RUSTC) foo.rs --crate-type=rlib -o $(TMPDIR)/foo
 	rm $(TMPDIR)/foo
 	[ "$$(ls -1 $(TMPDIR) | wc -l)" -eq "0" ]
 
-	$(RUSTC) foo.rs --crate-type=dylib -o $(TMPDIR)/foo
-	rm $(TMPDIR)/$(call BIN,foo)  # FIXME 13794
+	$(RUSTC) foo.rs --crate-type=dylib -o $(TMPDIR)/$(call BIN,foo)
+	rm $(TMPDIR)/$(call BIN,foo)
+	rm -f $(TMPDIR)/foo.{exp,lib}
 	[ "$$(ls -1 $(TMPDIR) | wc -l)" -eq "0" ]
 
 	$(RUSTC) foo.rs --crate-type=staticlib -o $(TMPDIR)/foo
 	rm $(TMPDIR)/foo
 	[ "$$(ls -1 $(TMPDIR) | wc -l)" -eq "0" ]
 
-	$(RUSTC) foo.rs --crate-type=bin -o $(TMPDIR)/foo
+	$(RUSTC) foo.rs --crate-type=bin -o $(TMPDIR)/$(call BIN,foo)
 	rm $(TMPDIR)/$(call BIN,foo)
 	[ "$$(ls -1 $(TMPDIR) | wc -l)" -eq "0" ]
 
diff --git a/src/test/run-make/relocation-model/Makefile b/src/test/run-make/relocation-model/Makefile
diff --git a/src/test/run-make/static-dylib-by-default/Makefile b/src/test/run-make/static-dylib-by-default/Makefile
diff --git a/src/test/run-make/tools.mk b/src/test/run-make/tools.mk
