From 36a0eed12a15dfc12a10b4455200adf03200dce9 Mon Sep 17 00:00:00 2001
From: Simon Brunel <simonbrunel@users.noreply.github.com>
Date: Tue, 19 Sep 2017 09:39:13 +0200
Subject: [PATCH] Move tests under their own qtpromise sub folder

---
 tests/auto/auto.pro                                       | 8 +-------
 tests/auto/{ => qtpromise}/benchmark/benchmark.pro        | 2 +-
 tests/auto/{ => qtpromise}/benchmark/tst_benchmark.cpp    | 0
 tests/auto/{ => qtpromise}/future/future.pro              | 2 +-
 tests/auto/{ => qtpromise}/future/tst_future.cpp          | 0
 tests/auto/{ => qtpromise}/helpers/helpers.pro            | 2 +-
 tests/auto/{ => qtpromise}/helpers/tst_helpers.cpp        | 0
 tests/auto/{ => qtpromise}/qpromise/qpromise.pro          | 2 +-
 tests/auto/{ => qtpromise}/qpromise/tst_qpromise.cpp      | 0
 tests/auto/{tests.pri => qtpromise/qtpromise.pri}         | 6 +++---
 tests/auto/qtpromise/qtpromise.pro                        | 8 ++++++++
 tests/auto/{ => qtpromise}/requirements/requirements.pro  | 2 +-
 .../{ => qtpromise}/requirements/tst_requirements.cpp     | 0
 tests/auto/{ => qtpromise}/thread/thread.pro              | 2 +-
 tests/auto/{ => qtpromise}/thread/tst_thread.cpp          | 0
 15 files changed, 18 insertions(+), 16 deletions(-)
 rename tests/auto/{ => qtpromise}/benchmark/benchmark.pro (69%)
 rename tests/auto/{ => qtpromise}/benchmark/tst_benchmark.cpp (100%)
 rename tests/auto/{ => qtpromise}/future/future.pro (72%)
 rename tests/auto/{ => qtpromise}/future/tst_future.cpp (100%)
 rename tests/auto/{ => qtpromise}/helpers/helpers.pro (67%)
 rename tests/auto/{ => qtpromise}/helpers/tst_helpers.cpp (100%)
 rename tests/auto/{ => qtpromise}/qpromise/qpromise.pro (68%)
 rename tests/auto/{ => qtpromise}/qpromise/tst_qpromise.cpp (100%)
 rename tests/auto/{tests.pri => qtpromise/qtpromise.pri} (85%)
 create mode 100644 tests/auto/qtpromise/qtpromise.pro
 rename tests/auto/{ => qtpromise}/requirements/requirements.pro (71%)
 rename tests/auto/{ => qtpromise}/requirements/tst_requirements.cpp (100%)
 rename tests/auto/{ => qtpromise}/thread/thread.pro (72%)
 rename tests/auto/{ => qtpromise}/thread/tst_thread.cpp (100%)

diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index ff9600d..bfff61e 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -1,8 +1,2 @@
 TEMPLATE = subdirs
-SUBDIRS += \
-    benchmark \
-    future \
-    helpers \
-    qpromise \
-    requirements \
-    thread
+SUBDIRS += qtpromise
diff --git a/tests/auto/benchmark/benchmark.pro b/tests/auto/qtpromise/benchmark/benchmark.pro
similarity index 69%
rename from tests/auto/benchmark/benchmark.pro
rename to tests/auto/qtpromise/benchmark/benchmark.pro
index e032662..48df01f 100644
--- a/tests/auto/benchmark/benchmark.pro
+++ b/tests/auto/qtpromise/benchmark/benchmark.pro
@@ -1,4 +1,4 @@
 TARGET = tst_benchmark
 SOURCES += $$PWD/tst_benchmark.cpp
 
-include(../tests.pri)
+include(../qtpromise.pri)
diff --git a/tests/auto/benchmark/tst_benchmark.cpp b/tests/auto/qtpromise/benchmark/tst_benchmark.cpp
similarity index 100%
rename from tests/auto/benchmark/tst_benchmark.cpp
rename to tests/auto/qtpromise/benchmark/tst_benchmark.cpp
diff --git a/tests/auto/future/future.pro b/tests/auto/qtpromise/future/future.pro
similarity index 72%
rename from tests/auto/future/future.pro
rename to tests/auto/qtpromise/future/future.pro
index 1468b06..8857945 100644
--- a/tests/auto/future/future.pro
+++ b/tests/auto/qtpromise/future/future.pro
@@ -2,4 +2,4 @@ QT += concurrent
 TARGET = tst_future
 SOURCES += $$PWD/tst_future.cpp
 
-include(../tests.pri)
+include(../qtpromise.pri)
diff --git a/tests/auto/future/tst_future.cpp b/tests/auto/qtpromise/future/tst_future.cpp
similarity index 100%
rename from tests/auto/future/tst_future.cpp
rename to tests/auto/qtpromise/future/tst_future.cpp
diff --git a/tests/auto/helpers/helpers.pro b/tests/auto/qtpromise/helpers/helpers.pro
similarity index 67%
rename from tests/auto/helpers/helpers.pro
rename to tests/auto/qtpromise/helpers/helpers.pro
index 0fc1653..aa813c6 100644
--- a/tests/auto/helpers/helpers.pro
+++ b/tests/auto/qtpromise/helpers/helpers.pro
@@ -1,4 +1,4 @@
 TARGET = tst_helpers
 SOURCES += $$PWD/tst_helpers.cpp
 
-include(../tests.pri)
+include(../qtpromise.pri)
diff --git a/tests/auto/helpers/tst_helpers.cpp b/tests/auto/qtpromise/helpers/tst_helpers.cpp
similarity index 100%
rename from tests/auto/helpers/tst_helpers.cpp
rename to tests/auto/qtpromise/helpers/tst_helpers.cpp
diff --git a/tests/auto/qpromise/qpromise.pro b/tests/auto/qtpromise/qpromise/qpromise.pro
similarity index 68%
rename from tests/auto/qpromise/qpromise.pro
rename to tests/auto/qtpromise/qpromise/qpromise.pro
index 92ed1c4..0fb2a2f 100644
--- a/tests/auto/qpromise/qpromise.pro
+++ b/tests/auto/qtpromise/qpromise/qpromise.pro
@@ -1,4 +1,4 @@
 TARGET = tst_qpromise
 SOURCES += $$PWD/tst_qpromise.cpp
 
-include(../tests.pri)
+include(../qtpromise.pri)
diff --git a/tests/auto/qpromise/tst_qpromise.cpp b/tests/auto/qtpromise/qpromise/tst_qpromise.cpp
similarity index 100%
rename from tests/auto/qpromise/tst_qpromise.cpp
rename to tests/auto/qtpromise/qpromise/tst_qpromise.cpp
diff --git a/tests/auto/tests.pri b/tests/auto/qtpromise/qtpromise.pri
similarity index 85%
rename from tests/auto/tests.pri
rename to tests/auto/qtpromise/qtpromise.pri
index bcaabb9..ad49341 100644
--- a/tests/auto/tests.pri
+++ b/tests/auto/qtpromise/qtpromise.pri
@@ -5,8 +5,8 @@ QT -= gui
 
 DEFINES += QT_DEPRECATED_WARNINGS
 
-coverage: {
-    gcc: {
+coverage {
+    gcc {
         message("Code coverage enabled (gcov)")
         QMAKE_CXXFLAGS += --coverage -O0 -g
         QMAKE_LFLAGS += --coverage -O0 -g
@@ -15,4 +15,4 @@ coverage: {
     }
 }
 
-include(../../qtpromise.pri)
+include(../../../qtpromise.pri)
diff --git a/tests/auto/qtpromise/qtpromise.pro b/tests/auto/qtpromise/qtpromise.pro
new file mode 100644
index 0000000..ff9600d
--- /dev/null
+++ b/tests/auto/qtpromise/qtpromise.pro
@@ -0,0 +1,8 @@
+TEMPLATE = subdirs
+SUBDIRS += \
+    benchmark \
+    future \
+    helpers \
+    qpromise \
+    requirements \
+    thread
diff --git a/tests/auto/requirements/requirements.pro b/tests/auto/qtpromise/requirements/requirements.pro
similarity index 71%
rename from tests/auto/requirements/requirements.pro
rename to tests/auto/qtpromise/requirements/requirements.pro
index 2fab75b..da66aa5 100644
--- a/tests/auto/requirements/requirements.pro
+++ b/tests/auto/qtpromise/requirements/requirements.pro
@@ -1,4 +1,4 @@
 TARGET = tst_requirements
 SOURCES += $$PWD/tst_requirements.cpp
 
-include(../tests.pri)
+include(../qtpromise.pri)
diff --git a/tests/auto/requirements/tst_requirements.cpp b/tests/auto/qtpromise/requirements/tst_requirements.cpp
similarity index 100%
rename from tests/auto/requirements/tst_requirements.cpp
rename to tests/auto/qtpromise/requirements/tst_requirements.cpp
diff --git a/tests/auto/thread/thread.pro b/tests/auto/qtpromise/thread/thread.pro
similarity index 72%
rename from tests/auto/thread/thread.pro
rename to tests/auto/qtpromise/thread/thread.pro
index eebfce3..056a457 100644
--- a/tests/auto/thread/thread.pro
+++ b/tests/auto/qtpromise/thread/thread.pro
@@ -2,4 +2,4 @@ QT += concurrent
 TARGET = tst_thread
 SOURCES += $$PWD/tst_thread.cpp
 
-include(../tests.pri)
+include(../qtpromise.pri)
diff --git a/tests/auto/thread/tst_thread.cpp b/tests/auto/qtpromise/thread/tst_thread.cpp
similarity index 100%
rename from tests/auto/thread/tst_thread.cpp
rename to tests/auto/qtpromise/thread/tst_thread.cpp