aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@theqtcompany.com>2015-03-18 15:06:08 +0100
committerJari-Pekka Nurmi <jpnurmi@theqtcompany.com>2015-03-18 16:25:55 +0200
commit6b20665729716bbe61abea720a552b2c6d35b55c (patch)
tree16331ad32549e0f67b66defc3258ff92b6acaa2e
parent7cb166eb78a2f478bf491a9aedd9ad480181af38 (diff)
Rename tests/benchmark -> tests/benchmarks
Change-Id: I1ffd60772ca4a504d174c3ad4e321bf3c3fb5849 Reviewed-by: Jari-Pekka Nurmi <jpnurmi@theqtcompany.com>
-rw-r--r--.gitignore4
-rw-r--r--tests/benchmarks/benchmarks.pro (renamed from tests/benchmark/benchmark.pro)0
-rw-r--r--tests/benchmarks/creation/creation.pro (renamed from tests/benchmark/creation/creation.pro)0
-rw-r--r--tests/benchmarks/creation/tst_creation.cpp (renamed from tests/benchmark/creation/tst_creation.cpp)0
-rw-r--r--tests/benchmarks/objects/objects.pro (renamed from tests/benchmark/objects/objects.pro)0
-rw-r--r--tests/benchmarks/objects/tst_objects.cpp (renamed from tests/benchmark/objects/tst_objects.cpp)0
-rw-r--r--tests/tests.pro2
7 files changed, 3 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore
index 2cf8ee98..d14ff93e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,8 +9,8 @@
/tests/auto/controls/tst_controls
/tests/auto/extras/tst_extras
-/tests/benchmark/creation/tst_creation
-/tests/benchmark/objects/tst_objects
+/tests/benchmarks/creation/tst_creation
+/tests/benchmarks/objects/tst_objects
/src/controls/doc/qtquickcontrols2.tags
diff --git a/tests/benchmark/benchmark.pro b/tests/benchmarks/benchmarks.pro
index 5b06760b..5b06760b 100644
--- a/tests/benchmark/benchmark.pro
+++ b/tests/benchmarks/benchmarks.pro
diff --git a/tests/benchmark/creation/creation.pro b/tests/benchmarks/creation/creation.pro
index 5750cb9f..5750cb9f 100644
--- a/tests/benchmark/creation/creation.pro
+++ b/tests/benchmarks/creation/creation.pro
diff --git a/tests/benchmark/creation/tst_creation.cpp b/tests/benchmarks/creation/tst_creation.cpp
index 3fbbf3c3..3fbbf3c3 100644
--- a/tests/benchmark/creation/tst_creation.cpp
+++ b/tests/benchmarks/creation/tst_creation.cpp
diff --git a/tests/benchmark/objects/objects.pro b/tests/benchmarks/objects/objects.pro
index 21429271..21429271 100644
--- a/tests/benchmark/objects/objects.pro
+++ b/tests/benchmarks/objects/objects.pro
diff --git a/tests/benchmark/objects/tst_objects.cpp b/tests/benchmarks/objects/tst_objects.cpp
index b798cc01..b798cc01 100644
--- a/tests/benchmark/objects/tst_objects.cpp
+++ b/tests/benchmarks/objects/tst_objects.cpp
diff --git a/tests/tests.pro b/tests/tests.pro
index 0fb2302b..e98339ef 100644
--- a/tests/tests.pro
+++ b/tests/tests.pro
@@ -1,4 +1,4 @@
TEMPLATE = subdirs
SUBDIRS += \
auto \
- benchmark
+ benchmarks