summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorRohan McGovern <rohan.mcgovern@nokia.com>2011-09-14 13:15:17 +1000
committerQt by Nokia <qt-info@nokia.com>2011-09-15 01:02:58 +0200
commit7222f12530a83488b887927a9560a766cce1179f (patch)
treecaf6368bf40b3192426109492d2ee33c113f33d8 /tests
parenta17e3942f428429d5da520d6ca8593cbb1059176 (diff)
Move qtqa shared tests to tests/shared.
Having these tests under tests/auto is misleading: usually this directory contains tests for the containing module, but these tests are intended to be shared tests for _all_ Qt modules. Move them to tests/shared instead to make this difference clearer. Note the tests are now compiled by default, but not run by default. To run these tests, it's necessary to explicitly opt-in by doing a `make check' under the tests/shared directory. Change-Id: I42559710de8e70b708612da45c366d8d00e16ad6 Reviewed-on: http://codereview.qt-project.org/4855 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/shared/bic/.gitignore (renamed from tests/auto/bic/.gitignore)0
-rw-r--r--tests/shared/bic/bic.pro (renamed from tests/auto/bic/bic.pro)0
-rw-r--r--tests/shared/bic/data/QtWebKit.4.5.0.linux-gcc-amd64.txt (renamed from tests/auto/bic/data/QtWebKit.4.5.0.linux-gcc-amd64.txt)0
-rw-r--r--tests/shared/bic/data/QtWebKit.4.5.0.linux-gcc-ia32.txt (renamed from tests/auto/bic/data/QtWebKit.4.5.0.linux-gcc-ia32.txt)0
-rw-r--r--tests/shared/bic/data/QtWebKit.4.6.0.linux-gcc-amd64.txt (renamed from tests/auto/bic/data/QtWebKit.4.6.0.linux-gcc-amd64.txt)0
-rw-r--r--tests/shared/bic/data/QtWebKit.4.6.0.linux-gcc-ia32.txt (renamed from tests/auto/bic/data/QtWebKit.4.6.0.linux-gcc-ia32.txt)0
-rw-r--r--tests/shared/bic/data/QtWebKit.4.7.0.linux-gcc-ia32.txt (renamed from tests/auto/bic/data/QtWebKit.4.7.0.linux-gcc-ia32.txt)0
-rwxr-xr-xtests/shared/bic/gen.sh (renamed from tests/auto/bic/gen.sh)0
-rw-r--r--tests/shared/bic/qbic.cpp (renamed from tests/auto/bic/qbic.cpp)0
-rw-r--r--tests/shared/bic/qbic.h (renamed from tests/auto/bic/qbic.h)0
-rw-r--r--tests/shared/bic/tst_bic.cpp (renamed from tests/auto/bic/tst_bic.cpp)0
-rw-r--r--tests/shared/compilerwarnings/.gitignore (renamed from tests/auto/compilerwarnings/.gitignore)0
-rw-r--r--tests/shared/compilerwarnings/compilerwarnings.pro (renamed from tests/auto/compilerwarnings/compilerwarnings.pro)0
-rw-r--r--tests/shared/compilerwarnings/tst_compilerwarnings.cpp (renamed from tests/auto/compilerwarnings/tst_compilerwarnings.cpp)0
-rw-r--r--tests/shared/guiapplauncher/README.txt (renamed from tests/auto/guiapplauncher/README.txt)0
-rw-r--r--tests/shared/guiapplauncher/guiapplauncher.pro (renamed from tests/auto/guiapplauncher/guiapplauncher.pro)0
-rw-r--r--tests/shared/guiapplauncher/test.ts (renamed from tests/auto/guiapplauncher/test.ts)0
-rw-r--r--tests/shared/guiapplauncher/test.ui (renamed from tests/auto/guiapplauncher/test.ui)0
-rw-r--r--tests/shared/guiapplauncher/tst_guiapplauncher.cpp (renamed from tests/auto/guiapplauncher/tst_guiapplauncher.cpp)0
-rw-r--r--tests/shared/guiapplauncher/windowmanager.cpp (renamed from tests/auto/guiapplauncher/windowmanager.cpp)0
-rw-r--r--tests/shared/guiapplauncher/windowmanager.h (renamed from tests/auto/guiapplauncher/windowmanager.h)0
-rw-r--r--tests/shared/headers/.gitignore (renamed from tests/auto/headers/.gitignore)0
-rw-r--r--tests/shared/headers/headers.pro (renamed from tests/auto/headers/headers.pro)0
-rw-r--r--tests/shared/headers/tst_headers.cpp (renamed from tests/auto/headers/tst_headers.cpp)0
-rw-r--r--tests/shared/shared.pro (renamed from tests/auto/auto.pro)0
-rw-r--r--tests/shared/symbols/.gitignore (renamed from tests/auto/symbols/.gitignore)0
-rw-r--r--tests/shared/symbols/symbols.pro (renamed from tests/auto/symbols/symbols.pro)0
-rw-r--r--tests/shared/symbols/tst_symbols.cpp (renamed from tests/auto/symbols/tst_symbols.cpp)0
-rw-r--r--tests/tests.pro13
29 files changed, 12 insertions, 1 deletions
diff --git a/tests/auto/bic/.gitignore b/tests/shared/bic/.gitignore
index 6d728f13..6d728f13 100644
--- a/tests/auto/bic/.gitignore
+++ b/tests/shared/bic/.gitignore
diff --git a/tests/auto/bic/bic.pro b/tests/shared/bic/bic.pro
index 6d085c8d..6d085c8d 100644
--- a/tests/auto/bic/bic.pro
+++ b/tests/shared/bic/bic.pro
diff --git a/tests/auto/bic/data/QtWebKit.4.5.0.linux-gcc-amd64.txt b/tests/shared/bic/data/QtWebKit.4.5.0.linux-gcc-amd64.txt
index b516bf9e..b516bf9e 100644
--- a/tests/auto/bic/data/QtWebKit.4.5.0.linux-gcc-amd64.txt
+++ b/tests/shared/bic/data/QtWebKit.4.5.0.linux-gcc-amd64.txt
diff --git a/tests/auto/bic/data/QtWebKit.4.5.0.linux-gcc-ia32.txt b/tests/shared/bic/data/QtWebKit.4.5.0.linux-gcc-ia32.txt
index 7ea5070c..7ea5070c 100644
--- a/tests/auto/bic/data/QtWebKit.4.5.0.linux-gcc-ia32.txt
+++ b/tests/shared/bic/data/QtWebKit.4.5.0.linux-gcc-ia32.txt
diff --git a/tests/auto/bic/data/QtWebKit.4.6.0.linux-gcc-amd64.txt b/tests/shared/bic/data/QtWebKit.4.6.0.linux-gcc-amd64.txt
index 96f0d819..96f0d819 100644
--- a/tests/auto/bic/data/QtWebKit.4.6.0.linux-gcc-amd64.txt
+++ b/tests/shared/bic/data/QtWebKit.4.6.0.linux-gcc-amd64.txt
diff --git a/tests/auto/bic/data/QtWebKit.4.6.0.linux-gcc-ia32.txt b/tests/shared/bic/data/QtWebKit.4.6.0.linux-gcc-ia32.txt
index d6ffebfa..d6ffebfa 100644
--- a/tests/auto/bic/data/QtWebKit.4.6.0.linux-gcc-ia32.txt
+++ b/tests/shared/bic/data/QtWebKit.4.6.0.linux-gcc-ia32.txt
diff --git a/tests/auto/bic/data/QtWebKit.4.7.0.linux-gcc-ia32.txt b/tests/shared/bic/data/QtWebKit.4.7.0.linux-gcc-ia32.txt
index 686c70e6..686c70e6 100644
--- a/tests/auto/bic/data/QtWebKit.4.7.0.linux-gcc-ia32.txt
+++ b/tests/shared/bic/data/QtWebKit.4.7.0.linux-gcc-ia32.txt
diff --git a/tests/auto/bic/gen.sh b/tests/shared/bic/gen.sh
index 81f8ae77..81f8ae77 100755
--- a/tests/auto/bic/gen.sh
+++ b/tests/shared/bic/gen.sh
diff --git a/tests/auto/bic/qbic.cpp b/tests/shared/bic/qbic.cpp
index ef37d230..ef37d230 100644
--- a/tests/auto/bic/qbic.cpp
+++ b/tests/shared/bic/qbic.cpp
diff --git a/tests/auto/bic/qbic.h b/tests/shared/bic/qbic.h
index 09fb7859..09fb7859 100644
--- a/tests/auto/bic/qbic.h
+++ b/tests/shared/bic/qbic.h
diff --git a/tests/auto/bic/tst_bic.cpp b/tests/shared/bic/tst_bic.cpp
index 2159f482..2159f482 100644
--- a/tests/auto/bic/tst_bic.cpp
+++ b/tests/shared/bic/tst_bic.cpp
diff --git a/tests/auto/compilerwarnings/.gitignore b/tests/shared/compilerwarnings/.gitignore
index 3d70cafa..3d70cafa 100644
--- a/tests/auto/compilerwarnings/.gitignore
+++ b/tests/shared/compilerwarnings/.gitignore
diff --git a/tests/auto/compilerwarnings/compilerwarnings.pro b/tests/shared/compilerwarnings/compilerwarnings.pro
index 301834c1..301834c1 100644
--- a/tests/auto/compilerwarnings/compilerwarnings.pro
+++ b/tests/shared/compilerwarnings/compilerwarnings.pro
diff --git a/tests/auto/compilerwarnings/tst_compilerwarnings.cpp b/tests/shared/compilerwarnings/tst_compilerwarnings.cpp
index 0a3144ac..0a3144ac 100644
--- a/tests/auto/compilerwarnings/tst_compilerwarnings.cpp
+++ b/tests/shared/compilerwarnings/tst_compilerwarnings.cpp
diff --git a/tests/auto/guiapplauncher/README.txt b/tests/shared/guiapplauncher/README.txt
index 317f9d0b..317f9d0b 100644
--- a/tests/auto/guiapplauncher/README.txt
+++ b/tests/shared/guiapplauncher/README.txt
diff --git a/tests/auto/guiapplauncher/guiapplauncher.pro b/tests/shared/guiapplauncher/guiapplauncher.pro
index 1fe9c8b0..1fe9c8b0 100644
--- a/tests/auto/guiapplauncher/guiapplauncher.pro
+++ b/tests/shared/guiapplauncher/guiapplauncher.pro
diff --git a/tests/auto/guiapplauncher/test.ts b/tests/shared/guiapplauncher/test.ts
index 79c9c76d..79c9c76d 100644
--- a/tests/auto/guiapplauncher/test.ts
+++ b/tests/shared/guiapplauncher/test.ts
diff --git a/tests/auto/guiapplauncher/test.ui b/tests/shared/guiapplauncher/test.ui
index 02efcd45..02efcd45 100644
--- a/tests/auto/guiapplauncher/test.ui
+++ b/tests/shared/guiapplauncher/test.ui
diff --git a/tests/auto/guiapplauncher/tst_guiapplauncher.cpp b/tests/shared/guiapplauncher/tst_guiapplauncher.cpp
index 11f7d217..11f7d217 100644
--- a/tests/auto/guiapplauncher/tst_guiapplauncher.cpp
+++ b/tests/shared/guiapplauncher/tst_guiapplauncher.cpp
diff --git a/tests/auto/guiapplauncher/windowmanager.cpp b/tests/shared/guiapplauncher/windowmanager.cpp
index 93fc52db..93fc52db 100644
--- a/tests/auto/guiapplauncher/windowmanager.cpp
+++ b/tests/shared/guiapplauncher/windowmanager.cpp
diff --git a/tests/auto/guiapplauncher/windowmanager.h b/tests/shared/guiapplauncher/windowmanager.h
index 491b16c8..491b16c8 100644
--- a/tests/auto/guiapplauncher/windowmanager.h
+++ b/tests/shared/guiapplauncher/windowmanager.h
diff --git a/tests/auto/headers/.gitignore b/tests/shared/headers/.gitignore
index 45f4e49e..45f4e49e 100644
--- a/tests/auto/headers/.gitignore
+++ b/tests/shared/headers/.gitignore
diff --git a/tests/auto/headers/headers.pro b/tests/shared/headers/headers.pro
index 703da7c9..703da7c9 100644
--- a/tests/auto/headers/headers.pro
+++ b/tests/shared/headers/headers.pro
diff --git a/tests/auto/headers/tst_headers.cpp b/tests/shared/headers/tst_headers.cpp
index 76300eaf..76300eaf 100644
--- a/tests/auto/headers/tst_headers.cpp
+++ b/tests/shared/headers/tst_headers.cpp
diff --git a/tests/auto/auto.pro b/tests/shared/shared.pro
index 66352db5..66352db5 100644
--- a/tests/auto/auto.pro
+++ b/tests/shared/shared.pro
diff --git a/tests/auto/symbols/.gitignore b/tests/shared/symbols/.gitignore
index c9d6e704..c9d6e704 100644
--- a/tests/auto/symbols/.gitignore
+++ b/tests/shared/symbols/.gitignore
diff --git a/tests/auto/symbols/symbols.pro b/tests/shared/symbols/symbols.pro
index 370aee56..370aee56 100644
--- a/tests/auto/symbols/symbols.pro
+++ b/tests/shared/symbols/symbols.pro
diff --git a/tests/auto/symbols/tst_symbols.cpp b/tests/shared/symbols/tst_symbols.cpp
index 0f30efe7..0f30efe7 100644
--- a/tests/auto/symbols/tst_symbols.cpp
+++ b/tests/shared/symbols/tst_symbols.cpp
diff --git a/tests/tests.pro b/tests/tests.pro
index 85e4f3a5..5606d52a 100644
--- a/tests/tests.pro
+++ b/tests/tests.pro
@@ -1,2 +1,13 @@
TEMPLATE = subdirs
-SUBDIRS += auto
+SUBDIRS += shared
+
+# The `shared' directory is a special case. It does _not_ contain autotests
+# specifically for qtqa - rather it contains autotests which may be applied to
+# any Qt module. They are not supposed to be run by default when doing
+# `make check' in qtqa - if you want to run them, you need to explicitly opt-in
+# by doing `make check' under tests/shared .
+check.CONFIG = recursive
+check.recurse = $$SUBDIRS
+check.recurse -= shared
+check.recurse_target = check
+QMAKE_EXTRA_TARGETS += check