From 17bfbb99e5897ac759aca42d3ee375ebb33bd087 Mon Sep 17 00:00:00 2001
From: Jussi Pakkanen <jpakkane@gmail.com>
Date: Tue, 31 Jul 2018 19:22:24 +0300
Subject: Condense test dirs.

---
 test cases/objc/4 c++ project objc subproject/master.cpp      | 11 +++++++++++
 test cases/objc/4 c++ project objc subproject/meson.build     |  6 ++++++
 .../objc/4 c++ project objc subproject/subprojects/foo/foo.m  |  4 ++++
 .../4 c++ project objc subproject/subprojects/foo/meson.build |  5 +++++
 test cases/objc/6 c++ project objc subproject/master.cpp      | 11 -----------
 test cases/objc/6 c++ project objc subproject/meson.build     |  6 ------
 .../objc/6 c++ project objc subproject/subprojects/foo/foo.m  |  4 ----
 .../6 c++ project objc subproject/subprojects/foo/meson.build |  5 -----
 8 files changed, 26 insertions(+), 26 deletions(-)
 create mode 100644 test cases/objc/4 c++ project objc subproject/master.cpp
 create mode 100644 test cases/objc/4 c++ project objc subproject/meson.build
 create mode 100644 test cases/objc/4 c++ project objc subproject/subprojects/foo/foo.m
 create mode 100644 test cases/objc/4 c++ project objc subproject/subprojects/foo/meson.build
 delete mode 100644 test cases/objc/6 c++ project objc subproject/master.cpp
 delete mode 100644 test cases/objc/6 c++ project objc subproject/meson.build
 delete mode 100644 test cases/objc/6 c++ project objc subproject/subprojects/foo/foo.m
 delete mode 100644 test cases/objc/6 c++ project objc subproject/subprojects/foo/meson.build

(limited to 'test cases/objc')

diff --git a/test cases/objc/4 c++ project objc subproject/master.cpp b/test cases/objc/4 c++ project objc subproject/master.cpp
new file mode 100644
index 000000000..2f351d1ca
--- /dev/null
+++ b/test cases/objc/4 c++ project objc subproject/master.cpp	
@@ -0,0 +1,11 @@
+
+#include <iostream>
+
+extern "C"
+int foo();
+
+int main() {
+  std::cout << "Starting\n";
+  std::cout << foo() << "\n";
+  return 0;
+}
diff --git a/test cases/objc/4 c++ project objc subproject/meson.build b/test cases/objc/4 c++ project objc subproject/meson.build
new file mode 100644
index 000000000..8a77dedce
--- /dev/null
+++ b/test cases/objc/4 c++ project objc subproject/meson.build	
@@ -0,0 +1,6 @@
+project('master', ['cpp'])
+
+foo = subproject('foo')
+dep = foo.get_variable('foo_dep')
+
+executable('master', 'master.cpp', dependencies: dep)
diff --git a/test cases/objc/4 c++ project objc subproject/subprojects/foo/foo.m b/test cases/objc/4 c++ project objc subproject/subprojects/foo/foo.m
new file mode 100644
index 000000000..e193b8681
--- /dev/null
+++ b/test cases/objc/4 c++ project objc subproject/subprojects/foo/foo.m	
@@ -0,0 +1,4 @@
+
+int foo() {
+  return 42;
+}
diff --git a/test cases/objc/4 c++ project objc subproject/subprojects/foo/meson.build b/test cases/objc/4 c++ project objc subproject/subprojects/foo/meson.build
new file mode 100644
index 000000000..2dbf8ab26
--- /dev/null
+++ b/test cases/objc/4 c++ project objc subproject/subprojects/foo/meson.build	
@@ -0,0 +1,5 @@
+project('foo', ['objc'])
+
+l = static_library('foo', 'foo.m')
+
+foo_dep = declare_dependency(link_with : l)
diff --git a/test cases/objc/6 c++ project objc subproject/master.cpp b/test cases/objc/6 c++ project objc subproject/master.cpp
deleted file mode 100644
index 2f351d1ca..000000000
--- a/test cases/objc/6 c++ project objc subproject/master.cpp	
+++ /dev/null
@@ -1,11 +0,0 @@
-
-#include <iostream>
-
-extern "C"
-int foo();
-
-int main() {
-  std::cout << "Starting\n";
-  std::cout << foo() << "\n";
-  return 0;
-}
diff --git a/test cases/objc/6 c++ project objc subproject/meson.build b/test cases/objc/6 c++ project objc subproject/meson.build
deleted file mode 100644
index 8a77dedce..000000000
--- a/test cases/objc/6 c++ project objc subproject/meson.build	
+++ /dev/null
@@ -1,6 +0,0 @@
-project('master', ['cpp'])
-
-foo = subproject('foo')
-dep = foo.get_variable('foo_dep')
-
-executable('master', 'master.cpp', dependencies: dep)
diff --git a/test cases/objc/6 c++ project objc subproject/subprojects/foo/foo.m b/test cases/objc/6 c++ project objc subproject/subprojects/foo/foo.m
deleted file mode 100644
index e193b8681..000000000
--- a/test cases/objc/6 c++ project objc subproject/subprojects/foo/foo.m	
+++ /dev/null
@@ -1,4 +0,0 @@
-
-int foo() {
-  return 42;
-}
diff --git a/test cases/objc/6 c++ project objc subproject/subprojects/foo/meson.build b/test cases/objc/6 c++ project objc subproject/subprojects/foo/meson.build
deleted file mode 100644
index 2dbf8ab26..000000000
--- a/test cases/objc/6 c++ project objc subproject/subprojects/foo/meson.build	
+++ /dev/null
@@ -1,5 +0,0 @@
-project('foo', ['objc'])
-
-l = static_library('foo', 'foo.m')
-
-foo_dep = declare_dependency(link_with : l)
-- 
cgit v1.2.3