summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorOliver Wolff <oliver.wolff@qt.io>2018-12-05 14:16:15 +0100
committerOliver Wolff <oliver.wolff@qt.io>2018-12-06 06:30:58 +0000
commit9c7085322f8516f39df16094d2c5f12bbf129526 (patch)
treeb35ee5536bef7561310457c356bc3e8099fde61d /tests
parentb3b387698e8f685e8bd4f4843a170da40e17249b (diff)
Prepare tst_qnearfieldtagtype2 for configurations with builtin_testdata
We have to add relevant test data to TESTDATA and use them from the created qrc file. As the emulated TagActivator for configurations with builtin_testdata uses "nfcdata" as the root it searches for ".nfc" files, the test data has to be moved into a folder that is called like that. We cannot move the type 2 testdata into the shared nfcdata folder as this would mix up tag types 1 and 2 and thus make the tests fail. Change-Id: I424dbab5c952408b441f1d67bdcd2fad635f15f4 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/qnearfieldtagtype2/nfcdata/Dynamic Empty Tag.nfc (renamed from tests/auto/qnearfieldtagtype2/Dynamic Empty Tag.nfc)0
-rw-r--r--tests/auto/qnearfieldtagtype2/nfcdata/Empty Tag.nfc (renamed from tests/auto/qnearfieldtagtype2/Empty Tag.nfc)0
-rw-r--r--tests/auto/qnearfieldtagtype2/qnearfieldtagtype2.pro7
3 files changed, 6 insertions, 1 deletions
diff --git a/tests/auto/qnearfieldtagtype2/Dynamic Empty Tag.nfc b/tests/auto/qnearfieldtagtype2/nfcdata/Dynamic Empty Tag.nfc
index 30cf6b2d..30cf6b2d 100644
--- a/tests/auto/qnearfieldtagtype2/Dynamic Empty Tag.nfc
+++ b/tests/auto/qnearfieldtagtype2/nfcdata/Dynamic Empty Tag.nfc
diff --git a/tests/auto/qnearfieldtagtype2/Empty Tag.nfc b/tests/auto/qnearfieldtagtype2/nfcdata/Empty Tag.nfc
index 22b31b4a..22b31b4a 100644
--- a/tests/auto/qnearfieldtagtype2/Empty Tag.nfc
+++ b/tests/auto/qnearfieldtagtype2/nfcdata/Empty Tag.nfc
diff --git a/tests/auto/qnearfieldtagtype2/qnearfieldtagtype2.pro b/tests/auto/qnearfieldtagtype2/qnearfieldtagtype2.pro
index 45d2fbe8..aa388312 100644
--- a/tests/auto/qnearfieldtagtype2/qnearfieldtagtype2.pro
+++ b/tests/auto/qnearfieldtagtype2/qnearfieldtagtype2.pro
@@ -21,4 +21,9 @@ SOURCES += \
qnearfieldmanager_emulator.cpp \
targetemulator.cpp
-DEFINES += SRCDIR=\\\"$$PWD\\\"
+DEFINES += SRCDIR=\\\"$$PWD/nfcdata\\\"
+
+TESTDATA += "$$PWD/nfcdata/Dynamic Empty Tag.nfc" \
+ "$$PWD/nfcdata/Empty Tag.nfc"
+
+builtin_testdata: DEFINES += BUILTIN_TESTDATA