Move issue-36710 test to run-make

Somewhat hacky to reuse `tools.mk` like this, we should probably migrate
most of them now

diff --git a/src/test/run-make-fulldeps/issue-36710/Makefile b/src/test/run-make-fulldeps/issue-36710/Makefile
deleted file mode 100644 (file)
index 7eba52f..0000000
--- a/src/test/run-make-fulldeps/issue-36710/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
--include ../tools.mk
-
-all: foo
-       $(call RUN,foo)
-
-foo: foo.rs $(call NATIVE_STATICLIB,foo)
-       $(RUSTC) $< -lfoo $(EXTRARSCXXFLAGS)
-
-$(TMPDIR)/libfoo.o: foo.cpp
-       $(call COMPILE_OBJ_CXX,$@,$<)

diff --git a/src/test/run-make-fulldeps/issue-36710/foo.cpp b/src/test/run-make-fulldeps/issue-36710/foo.cpp
deleted file mode 100644 (file)
index 8f878c2..0000000
--- a/src/test/run-make-fulldeps/issue-36710/foo.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-#include <stdint.h>
-
-struct A {
-    A() { v = 1234; }
-    ~A() { v = 1; }
-    uint32_t v;
-};
-
-A a;
-
-extern "C" {
-    uint32_t get() {
-        return a.v;
-    }
-}

diff --git a/src/test/run-make-fulldeps/issue-36710/foo.rs b/src/test/run-make-fulldeps/issue-36710/foo.rs
deleted file mode 100644 (file)
index 061f07c..0000000
--- a/src/test/run-make-fulldeps/issue-36710/foo.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-// Tests that linking to C++ code with global destructors works.
-
-// For linking libstdc++ on MinGW
-#![cfg_attr(all(windows, target_env = "gnu"), feature(static_nobundle))]
-
-extern { fn get() -> u32; }
-
-fn main() {
-    let i = unsafe { get() };
-    assert_eq!(i, 1234);
-}

diff --git a/src/test/run-make/issue-36710/Makefile b/src/test/run-make/issue-36710/Makefile
new file mode 100644 (file)
index 0000000..fe8061c
--- /dev/null
+++ b/src/test/run-make/issue-36710/Makefile
@@ -0,0 +1,10 @@
+include ../../run-make-fulldeps/tools.mk
+
+all: foo
+       $(call RUN,foo)
+
+foo: foo.rs $(call NATIVE_STATICLIB,foo)
+       $(RUSTC) $< -lfoo $(EXTRARSCXXFLAGS)
+
+$(TMPDIR)/libfoo.o: foo.cpp
+       $(call COMPILE_OBJ_CXX,$@,$<)

diff --git a/src/test/run-make/issue-36710/foo.cpp b/src/test/run-make/issue-36710/foo.cpp
new file mode 100644 (file)
index 0000000..8f878c2
--- /dev/null
+++ b/src/test/run-make/issue-36710/foo.cpp
@@ -0,0 +1,15 @@
+#include <stdint.h>
+
+struct A {
+    A() { v = 1234; }
+    ~A() { v = 1; }
+    uint32_t v;
+};
+
+A a;
+
+extern "C" {
+    uint32_t get() {
+        return a.v;
+    }
+}

diff --git a/src/test/run-make/issue-36710/foo.rs b/src/test/run-make/issue-36710/foo.rs
new file mode 100644 (file)
index 0000000..061f07c
--- /dev/null
+++ b/src/test/run-make/issue-36710/foo.rs
@@ -0,0 +1,11 @@
+// Tests that linking to C++ code with global destructors works.
+
+// For linking libstdc++ on MinGW
+#![cfg_attr(all(windows, target_env = "gnu"), feature(static_nobundle))]
+
+extern { fn get() -> u32; }
+
+fn main() {
+    let i = unsafe { get() };
+    assert_eq!(i, 1234);
+}