From: Jannik ZANDER <jannikz@gmail.com>
Date: Mon, 16 Jul 2018 15:56:54 +0000 (+0200)
Subject: Move into subdir's
X-Git-Url: https://git.zndr.dk/?a=commitdiff_plain;h=2a4a4e81194a125dacdfa3734f583c24d43a027e;p=meson-test.git

Move into subdir's
---

diff --git a/folder1.c b/folder1.c
deleted file mode 100644
index 6064ddc..0000000
--- a/folder1.c
+++ /dev/null
@@ -1,11 +0,0 @@
-#include "folder1.h"
-
-int function1()
-{
-  return 1;
-}
-
-int function2()
-{
-  return 2;
-}
diff --git a/folder1.h b/folder1.h
deleted file mode 100644
index ae3e5bd..0000000
--- a/folder1.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef FOLDER1_H
-#define FOLDER1_H
-
-int function1();
-int function2();
-
-#endif // FOLDER1_H
\ No newline at end of file
diff --git a/folder1/folder1.c b/folder1/folder1.c
new file mode 100644
index 0000000..6064ddc
--- /dev/null
+++ b/folder1/folder1.c
@@ -0,0 +1,11 @@
+#include "folder1.h"
+
+int function1()
+{
+  return 1;
+}
+
+int function2()
+{
+  return 2;
+}
diff --git a/folder1/folder1.h b/folder1/folder1.h
new file mode 100644
index 0000000..ae3e5bd
--- /dev/null
+++ b/folder1/folder1.h
@@ -0,0 +1,7 @@
+#ifndef FOLDER1_H
+#define FOLDER1_H
+
+int function1();
+int function2();
+
+#endif // FOLDER1_H
\ No newline at end of file
diff --git a/folder1/folder1_test.cpp b/folder1/folder1_test.cpp
new file mode 100644
index 0000000..68d7673
--- /dev/null
+++ b/folder1/folder1_test.cpp
@@ -0,0 +1,15 @@
+#include "gtest/gtest.h"
+extern "C" {
+#include "folder1.h"
+}
+
+TEST(function1_test, compare1)
+{
+  ASSERT_EQ(function1(), 1) << "Values are equal function1 == 1";
+}
+
+TEST(function2_test, compare2)
+{
+  ASSERT_EQ(function2(), 2) << "Values are equal function2 == 2";
+}
+
diff --git a/folder1/meson.build b/folder1/meson.build
new file mode 100644
index 0000000..77cc3d9
--- /dev/null
+++ b/folder1/meson.build
@@ -0,0 +1,6 @@
+# Test 1
+folder1 = 'folder1.c'
+folder1_test = executable('test 1', 
+                          'folder1_test.cpp', folder1,
+                          dependencies : gtest)
+test('test 1', folder1_test)
diff --git a/folder1_test.cpp b/folder1_test.cpp
deleted file mode 100644
index 7b8f315..0000000
--- a/folder1_test.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-#include "gtest/gtest.h"
-extern "C" {
-#include "folder1.h"
-}
-
-TEST(function1_test, compare1)
-{
-  ASSERT_EQ(function1(), 1) << "Values are equal function1 == 1";
-}
-
-TEST(function2_test, compare2)
-{
-  ASSERT_EQ(function2(), 3) << "Values are equal function2 == 2";
-}
-
diff --git a/folder2.c b/folder2.c
deleted file mode 100644
index 2d27b97..0000000
--- a/folder2.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "folder1.h"
-#include "folder2.h"
-
-
-int function3()
-{
-  return function1()+function2();
-}
diff --git a/folder2.h b/folder2.h
deleted file mode 100644
index b03ea51..0000000
--- a/folder2.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef FOLDER2_H
-#define FOLDER2_H
-
-int function3();
-
-#endif // FOLDER2_H
\ No newline at end of file
diff --git a/folder2/folder2.c b/folder2/folder2.c
new file mode 100644
index 0000000..24fd977
--- /dev/null
+++ b/folder2/folder2.c
@@ -0,0 +1,8 @@
+#include "../folder1/folder1.h"
+#include "folder2.h"
+
+
+int function3()
+{
+  return function1()+function2();
+}
diff --git a/folder2/folder2.h b/folder2/folder2.h
new file mode 100644
index 0000000..b03ea51
--- /dev/null
+++ b/folder2/folder2.h
@@ -0,0 +1,6 @@
+#ifndef FOLDER2_H
+#define FOLDER2_H
+
+int function3();
+
+#endif // FOLDER2_H
\ No newline at end of file
diff --git a/folder2/folder2_test.cpp b/folder2/folder2_test.cpp
new file mode 100644
index 0000000..6e0d942
--- /dev/null
+++ b/folder2/folder2_test.cpp
@@ -0,0 +1,9 @@
+#include "gtest/gtest.h"
+extern "C" {
+#include "folder2.h"
+}
+
+TEST(function3_test, compare3)
+{
+  ASSERT_EQ(function3(), 3) << "Values are equal function3 == 3";
+}
diff --git a/folder2/meson.build b/folder2/meson.build
new file mode 100644
index 0000000..9624265
--- /dev/null
+++ b/folder2/meson.build
@@ -0,0 +1,8 @@
+
+# Test 2
+folder1 = '../folder1/folder1.c'
+folder2 = 'folder2.c'
+folder2_test = executable('test 2',
+                          'folder2_test.cpp', folder1, folder2,
+                          dependencies : gtest)
+test('test 2', folder2_test)
diff --git a/folder2_test.cpp b/folder2_test.cpp
deleted file mode 100644
index 6e0d942..0000000
--- a/folder2_test.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-#include "gtest/gtest.h"
-extern "C" {
-#include "folder2.h"
-}
-
-TEST(function3_test, compare3)
-{
-  ASSERT_EQ(function3(), 3) << "Values are equal function3 == 3";
-}
diff --git a/meson.build b/meson.build
index 1396d17..0fdd14d 100644
--- a/meson.build
+++ b/meson.build
@@ -3,13 +3,8 @@ project('meson_test','cpp', 'c')
 gtest = dependency('gtest', main : true, required : false)
 
 # Test 1
-folder1 = 'folder1.c'
-folder1_test = executable('test1', 'folder1_test.cpp', folder1,
-                          dependencies : gtest)
-test('folder1 test', folder1_test)
+subdir('folder1')
 
 # Test 2
-folder2 = 'folder2.c'
-folder2_test = executable('test2', 'folder2_test.cpp', folder1, folder2,
-                          dependencies : gtest)
-test('folder2 test', folder2_test)
+subdir('folder2')
+