summaryrefslogtreecommitdiffstats
path: root/tests/auto/corelib/io/qfile
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/corelib/io/qfile')
-rw-r--r--tests/auto/corelib/io/qfile/.prev_CMakeLists.txt18
-rw-r--r--tests/auto/corelib/io/qfile/BLACKLIST7
-rw-r--r--tests/auto/corelib/io/qfile/CMakeLists.txt20
3 files changed, 31 insertions, 14 deletions
diff --git a/tests/auto/corelib/io/qfile/.prev_CMakeLists.txt b/tests/auto/corelib/io/qfile/.prev_CMakeLists.txt
index 57824a82c7..7b5c5bab8c 100644
--- a/tests/auto/corelib/io/qfile/.prev_CMakeLists.txt
+++ b/tests/auto/corelib/io/qfile/.prev_CMakeLists.txt
@@ -30,23 +30,35 @@ add_qt_test(tst_qfile
)
# Resources:
+set(qfile_resource_files
+ "resources/"
+)
+
add_qt_resource(tst_qfile "qfile"
PREFIX
"/tst_qfileinfo/"
FILES
- "resources/"
+ ${qfile_resource_files}
+)
+set(rename-fallback_resource_files
+ "rename-fallback.qrc"
)
+
add_qt_resource(tst_qfile "rename-fallback"
PREFIX
"/"
FILES
- "rename-fallback.qrc"
+ ${rename-fallback_resource_files}
+)
+set(copy-fallback_resource_files
+ "copy-fallback.qrc"
)
+
add_qt_resource(tst_qfile "copy-fallback"
PREFIX
"/"
FILES
- "copy-fallback.qrc"
+ ${copy-fallback_resource_files}
)
diff --git a/tests/auto/corelib/io/qfile/BLACKLIST b/tests/auto/corelib/io/qfile/BLACKLIST
deleted file mode 100644
index 8366667166..0000000000
--- a/tests/auto/corelib/io/qfile/BLACKLIST
+++ /dev/null
@@ -1,7 +0,0 @@
-# QTBUG-48455
-[readLineStdin]
-msvc-2015 ci
-msvc-2017 ci
-[readLineStdin_lineByLine]
-msvc-2015 ci
-msvc-2017 ci
diff --git a/tests/auto/corelib/io/qfile/CMakeLists.txt b/tests/auto/corelib/io/qfile/CMakeLists.txt
index d4fd6e48cf..70c471858c 100644
--- a/tests/auto/corelib/io/qfile/CMakeLists.txt
+++ b/tests/auto/corelib/io/qfile/CMakeLists.txt
@@ -5,7 +5,7 @@
#####################################################################
# Collect test data
-list(APPEND test_data "BLACKLIST")
+# list(APPEND test_data "BLACKLIST") # special case remove
list(APPEND test_data "dosfile.txt")
list(APPEND test_data "noendofline.txt")
list(APPEND test_data "testfile.txt")
@@ -30,23 +30,35 @@ add_qt_test(tst_qfile
)
# Resources:
+set(qfile_resource_files
+ "resources/"
+)
+
add_qt_resource(tst_qfile "qfile"
PREFIX
"/tst_qfileinfo/"
FILES
- "resources/"
+ ${qfile_resource_files}
+)
+set(rename-fallback_resource_files
+ "rename-fallback.qrc"
)
+
add_qt_resource(tst_qfile "rename-fallback"
PREFIX
"/"
FILES
- "rename-fallback.qrc"
+ ${rename-fallback_resource_files}
+)
+set(copy-fallback_resource_files
+ "copy-fallback.qrc"
)
+
add_qt_resource(tst_qfile "copy-fallback"
PREFIX
"/"
FILES
- "copy-fallback.qrc"
+ ${copy-fallback_resource_files}
)