summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2010-01-06 13:17:57 (GMT)
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>2010-01-06 18:16:22 (GMT)
commit40e3c68a38152ecdc354a2d503490f9b0ff49740 (patch)
tree3d5a51a177f35700dc2a0ef750689a9d726e0dfb /tests
parenta54a8961bad16c55bd0a56896dec42de875cc0b4 (diff)
downloadQt-40e3c68a38152ecdc354a2d503490f9b0ff49740.zip
Qt-40e3c68a38152ecdc354a2d503490f9b0ff49740.tar.gz
Qt-40e3c68a38152ecdc354a2d503490f9b0ff49740.tar.bz2
don't use qmake for test setup
this makes the tests rather significantly faster
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/linguist/lupdate/testdata/good/codecforsrc/project.pro5
-rw-r--r--tests/auto/linguist/lupdate/testdata/good/codecfortr/project.pro7
-rw-r--r--tests/auto/linguist/lupdate/testdata/good/codecfortr1/project.pro7
-rw-r--r--tests/auto/linguist/lupdate/testdata/good/codecfortr2/project.pro7
-rw-r--r--tests/auto/linguist/lupdate/testdata/good/lacksqobject/project.pro6
-rw-r--r--tests/auto/linguist/lupdate/testdata/good/merge_ordering/project.pro8
-rw-r--r--tests/auto/linguist/lupdate/testdata/good/merge_versions/project.pro8
-rw-r--r--tests/auto/linguist/lupdate/testdata/good/merge_whitespace/project.pro8
-rw-r--r--tests/auto/linguist/lupdate/testdata/good/mergecpp/project.pro8
-rw-r--r--tests/auto/linguist/lupdate/testdata/good/mergecpp_noobsolete/project.pro8
-rw-r--r--tests/auto/linguist/lupdate/testdata/good/mergecpp_obsolete/project.pro8
-rw-r--r--tests/auto/linguist/lupdate/testdata/good/mergeui/project.pro8
-rw-r--r--tests/auto/linguist/lupdate/testdata/good/mergeui_obsolete/project.pro8
-rw-r--r--tests/auto/linguist/lupdate/testdata/good/multiple_locations/project.pro6
-rw-r--r--tests/auto/linguist/lupdate/testdata/good/namespaces/project.pro6
-rw-r--r--tests/auto/linguist/lupdate/testdata/good/parse_special_chars/project.pro6
-rw-r--r--tests/auto/linguist/lupdate/testdata/good/parsecontexts/project.pro6
-rw-r--r--tests/auto/linguist/lupdate/testdata/good/parsecpp/project.pro6
-rw-r--r--tests/auto/linguist/lupdate/testdata/good/parsecpp2/project.pro6
-rw-r--r--tests/auto/linguist/lupdate/testdata/good/parsejava/project.pro6
-rw-r--r--tests/auto/linguist/lupdate/testdata/good/parseui/project.pro7
-rw-r--r--tests/auto/linguist/lupdate/testdata/good/prefix/project.pro6
-rw-r--r--tests/auto/linguist/lupdate/testdata/good/preprocess/project.pro6
-rw-r--r--tests/auto/linguist/lupdate/testdata/good/proparsing/project.pro6
-rw-r--r--tests/auto/linguist/lupdate/testdata/good/proparsing2/project.pro6
-rw-r--r--tests/auto/linguist/lupdate/testdata/good/proparsingpaths/project.pro5
-rw-r--r--tests/auto/linguist/lupdate/testdata/good/proparsingpri/project.pro5
-rw-r--r--tests/auto/linguist/lupdate/testdata/good/proparsingsubdirs/sub1/sub1.pro5
-rw-r--r--tests/auto/linguist/lupdate/testdata/good/proparsingsubs/project.pro5
-rw-r--r--tests/auto/linguist/lupdate/testdata/good/reloutput/project.pro6
-rw-r--r--tests/auto/linguist/lupdate/testdata/good/textsimilarity/project.pro8
-rw-r--r--tests/auto/linguist/lupdate/testlupdate.cpp8
-rw-r--r--tests/auto/linguist/lupdate/testlupdate.h2
-rw-r--r--tests/auto/linguist/lupdate/tst_lupdate.cpp7
34 files changed, 5 insertions, 215 deletions
diff --git a/tests/auto/linguist/lupdate/testdata/good/codecforsrc/project.pro b/tests/auto/linguist/lupdate/testdata/good/codecforsrc/project.pro
index 3b6559d..7225608 100644
--- a/tests/auto/linguist/lupdate/testdata/good/codecforsrc/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/codecforsrc/project.pro
@@ -5,8 +5,3 @@ TRANSLATIONS = project.ts
CODECFORTR = utf-8
CODECFORSRC = utf-8
-
-exists( $$TRANSLATIONS ) {
- win32: system(del $$TRANSLATIONS)
- unix: system(rm $$TRANSLATIONS)
-}
diff --git a/tests/auto/linguist/lupdate/testdata/good/codecfortr/project.pro b/tests/auto/linguist/lupdate/testdata/good/codecfortr/project.pro
index 841cfa6..64f3c85 100644
--- a/tests/auto/linguist/lupdate/testdata/good/codecfortr/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/codecfortr/project.pro
@@ -4,10 +4,3 @@ CONFIG+= console
TRANSLATIONS = project.ts
CODECFORTR = CP1251
-
-exists( $$TRANSLATIONS ) {
- win32: system(del $$TRANSLATIONS)
- unix: system(rm $$TRANSLATIONS)
-}
-
-
diff --git a/tests/auto/linguist/lupdate/testdata/good/codecfortr1/project.pro b/tests/auto/linguist/lupdate/testdata/good/codecfortr1/project.pro
index acbf8b9..d5697eb 100644
--- a/tests/auto/linguist/lupdate/testdata/good/codecfortr1/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/codecfortr1/project.pro
@@ -4,10 +4,3 @@ CONFIG += console
TRANSLATIONS = project.ts
CODECFORTR = CP1252
-
-exists( $$TRANSLATIONS ) {
- win32: system(del $$TRANSLATIONS)
- unix: system(rm $$TRANSLATIONS)
-}
-
-
diff --git a/tests/auto/linguist/lupdate/testdata/good/codecfortr2/project.pro b/tests/auto/linguist/lupdate/testdata/good/codecfortr2/project.pro
index 5b382ad..c95939c 100644
--- a/tests/auto/linguist/lupdate/testdata/good/codecfortr2/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/codecfortr2/project.pro
@@ -5,10 +5,3 @@ TRANSLATIONS = project.ts
CODECFORSRC = CP1252
CODECFORTR = UTF-8
-
-exists( $$TRANSLATIONS ) {
- win32: system(del $$TRANSLATIONS)
- unix: system(rm $$TRANSLATIONS)
-}
-
-
diff --git a/tests/auto/linguist/lupdate/testdata/good/lacksqobject/project.pro b/tests/auto/linguist/lupdate/testdata/good/lacksqobject/project.pro
index ff4dbd2..759bea0 100644
--- a/tests/auto/linguist/lupdate/testdata/good/lacksqobject/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/lacksqobject/project.pro
@@ -1,9 +1,3 @@
SOURCES = main.cpp
TRANSLATIONS = project.ts
-
-exists( $$TRANSLATIONS ) {
- win32: system(del $$TRANSLATIONS)
- unix: system(rm $$TRANSLATIONS)
-}
-
diff --git a/tests/auto/linguist/lupdate/testdata/good/merge_ordering/project.pro b/tests/auto/linguist/lupdate/testdata/good/merge_ordering/project.pro
index f8c7ca2..6149858 100644
--- a/tests/auto/linguist/lupdate/testdata/good/merge_ordering/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/merge_ordering/project.pro
@@ -1,11 +1,3 @@
SOURCES += foo.cpp
TRANSLATIONS = project.ts
-
-# Copy the ts to a temp file because:
-# 1. The depot file is usually read-only
-# 2. We don't want to modify the original file, since then it won't be possible to run the test twice
-# without reverting the original file again.
-
-win32: system(copy /Y project.ts.before $$TRANSLATIONS)
-unix: system(cp -f project.ts.before $$TRANSLATIONS && chmod a+w $$TRANSLATIONS)
diff --git a/tests/auto/linguist/lupdate/testdata/good/merge_versions/project.pro b/tests/auto/linguist/lupdate/testdata/good/merge_versions/project.pro
index 70dd7ce..fa56972 100644
--- a/tests/auto/linguist/lupdate/testdata/good/merge_versions/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/merge_versions/project.pro
@@ -1,11 +1,3 @@
FORMS += project.ui
TRANSLATIONS = project.ts
-
-# Copy the ts to a temp file because:
-# 1. The depot file is usually read-only
-# 2. We don't want to modify the original file, since then it won't be possible to run the test twice
-# without reverting the original file again.
-
-win32: system(copy /Y project.ts.before $$TRANSLATIONS)
-unix: system(cp -f project.ts.before $$TRANSLATIONS && chmod a+w $$TRANSLATIONS)
diff --git a/tests/auto/linguist/lupdate/testdata/good/merge_whitespace/project.pro b/tests/auto/linguist/lupdate/testdata/good/merge_whitespace/project.pro
index 7eea86d..759bea0 100644
--- a/tests/auto/linguist/lupdate/testdata/good/merge_whitespace/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/merge_whitespace/project.pro
@@ -1,11 +1,3 @@
SOURCES = main.cpp
TRANSLATIONS = project.ts
-
-# Copy the ts to a temp file because:
-# 1. The depot file is usually read-only
-# 2. We don't want to modify the original file, since then it won't be possible to run the test twice
-# without reverting the original file again.
-
-win32: system(copy /Y project.ts.before $$TRANSLATIONS)
-unix: system(cp -f project.ts.before $$TRANSLATIONS && chmod a+w $$TRANSLATIONS)
diff --git a/tests/auto/linguist/lupdate/testdata/good/mergecpp/project.pro b/tests/auto/linguist/lupdate/testdata/good/mergecpp/project.pro
index 698047a..63f5d66 100644
--- a/tests/auto/linguist/lupdate/testdata/good/mergecpp/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/mergecpp/project.pro
@@ -1,11 +1,3 @@
SOURCES += finddialog.cpp
TRANSLATIONS = project.ts
-
-# Copy the ts to a temp file because:
-# 1. The depot file is usually read-only
-# 2. We don't want to modify the original file, since then it won't be possible to run the test twice
-# without reverting the original file again.
-
-win32: system(copy /Y project.ts.before $$TRANSLATIONS)
-unix: system(cp -f project.ts.before $$TRANSLATIONS && chmod a+w $$TRANSLATIONS)
diff --git a/tests/auto/linguist/lupdate/testdata/good/mergecpp_noobsolete/project.pro b/tests/auto/linguist/lupdate/testdata/good/mergecpp_noobsolete/project.pro
index 698047a..63f5d66 100644
--- a/tests/auto/linguist/lupdate/testdata/good/mergecpp_noobsolete/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/mergecpp_noobsolete/project.pro
@@ -1,11 +1,3 @@
SOURCES += finddialog.cpp
TRANSLATIONS = project.ts
-
-# Copy the ts to a temp file because:
-# 1. The depot file is usually read-only
-# 2. We don't want to modify the original file, since then it won't be possible to run the test twice
-# without reverting the original file again.
-
-win32: system(copy /Y project.ts.before $$TRANSLATIONS)
-unix: system(cp -f project.ts.before $$TRANSLATIONS && chmod a+w $$TRANSLATIONS)
diff --git a/tests/auto/linguist/lupdate/testdata/good/mergecpp_obsolete/project.pro b/tests/auto/linguist/lupdate/testdata/good/mergecpp_obsolete/project.pro
index 698047a..63f5d66 100644
--- a/tests/auto/linguist/lupdate/testdata/good/mergecpp_obsolete/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/mergecpp_obsolete/project.pro
@@ -1,11 +1,3 @@
SOURCES += finddialog.cpp
TRANSLATIONS = project.ts
-
-# Copy the ts to a temp file because:
-# 1. The depot file is usually read-only
-# 2. We don't want to modify the original file, since then it won't be possible to run the test twice
-# without reverting the original file again.
-
-win32: system(copy /Y project.ts.before $$TRANSLATIONS)
-unix: system(cp -f project.ts.before $$TRANSLATIONS && chmod a+w $$TRANSLATIONS)
diff --git a/tests/auto/linguist/lupdate/testdata/good/mergeui/project.pro b/tests/auto/linguist/lupdate/testdata/good/mergeui/project.pro
index 9a0d55d..fa56972 100644
--- a/tests/auto/linguist/lupdate/testdata/good/mergeui/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/mergeui/project.pro
@@ -1,11 +1,3 @@
FORMS += project.ui
TRANSLATIONS = project.ts
-
-# Copy the ts to a temp file because:
-# 1. The depot file is usually read-only
-# 2. We don't want to modify the original file, since then it won't be possible to run the test twice
-# without reverting the original file again.
-
-win32: system(copy /Y project.ts.before $$TRANSLATIONS)
-unix: system(cp -f project.ts.before $$TRANSLATIONS && chmod a+w $$TRANSLATIONS)
diff --git a/tests/auto/linguist/lupdate/testdata/good/mergeui_obsolete/project.pro b/tests/auto/linguist/lupdate/testdata/good/mergeui_obsolete/project.pro
index 9a0d55d..fa56972 100644
--- a/tests/auto/linguist/lupdate/testdata/good/mergeui_obsolete/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/mergeui_obsolete/project.pro
@@ -1,11 +1,3 @@
FORMS += project.ui
TRANSLATIONS = project.ts
-
-# Copy the ts to a temp file because:
-# 1. The depot file is usually read-only
-# 2. We don't want to modify the original file, since then it won't be possible to run the test twice
-# without reverting the original file again.
-
-win32: system(copy /Y project.ts.before $$TRANSLATIONS)
-unix: system(cp -f project.ts.before $$TRANSLATIONS && chmod a+w $$TRANSLATIONS)
diff --git a/tests/auto/linguist/lupdate/testdata/good/multiple_locations/project.pro b/tests/auto/linguist/lupdate/testdata/good/multiple_locations/project.pro
index c3f1112..bbabdfb 100644
--- a/tests/auto/linguist/lupdate/testdata/good/multiple_locations/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/multiple_locations/project.pro
@@ -2,9 +2,3 @@ SOURCES += main.cpp
SOURCES += finddialog.cpp
TRANSLATIONS = project.ts
-
-exists( $$TRANSLATIONS ) {
- win32: system(del $$TRANSLATIONS)
- unix: system(rm $$TRANSLATIONS)
-}
-
diff --git a/tests/auto/linguist/lupdate/testdata/good/namespaces/project.pro b/tests/auto/linguist/lupdate/testdata/good/namespaces/project.pro
index 4ab0edf..c96859b 100644
--- a/tests/auto/linguist/lupdate/testdata/good/namespaces/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/namespaces/project.pro
@@ -1,9 +1,3 @@
SOURCES += main.cpp
TRANSLATIONS = project.ts
-
-exists( $$TRANSLATIONS ) {
- win32: system(del $$TRANSLATIONS)
- unix: system(rm $$TRANSLATIONS)
-}
-
diff --git a/tests/auto/linguist/lupdate/testdata/good/parse_special_chars/project.pro b/tests/auto/linguist/lupdate/testdata/good/parse_special_chars/project.pro
index 4ab0edf..c96859b 100644
--- a/tests/auto/linguist/lupdate/testdata/good/parse_special_chars/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/parse_special_chars/project.pro
@@ -1,9 +1,3 @@
SOURCES += main.cpp
TRANSLATIONS = project.ts
-
-exists( $$TRANSLATIONS ) {
- win32: system(del $$TRANSLATIONS)
- unix: system(rm $$TRANSLATIONS)
-}
-
diff --git a/tests/auto/linguist/lupdate/testdata/good/parsecontexts/project.pro b/tests/auto/linguist/lupdate/testdata/good/parsecontexts/project.pro
index ff4dbd2..759bea0 100644
--- a/tests/auto/linguist/lupdate/testdata/good/parsecontexts/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/parsecontexts/project.pro
@@ -1,9 +1,3 @@
SOURCES = main.cpp
TRANSLATIONS = project.ts
-
-exists( $$TRANSLATIONS ) {
- win32: system(del $$TRANSLATIONS)
- unix: system(rm $$TRANSLATIONS)
-}
-
diff --git a/tests/auto/linguist/lupdate/testdata/good/parsecpp/project.pro b/tests/auto/linguist/lupdate/testdata/good/parsecpp/project.pro
index c3f1112..bbabdfb 100644
--- a/tests/auto/linguist/lupdate/testdata/good/parsecpp/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/parsecpp/project.pro
@@ -2,9 +2,3 @@ SOURCES += main.cpp
SOURCES += finddialog.cpp
TRANSLATIONS = project.ts
-
-exists( $$TRANSLATIONS ) {
- win32: system(del $$TRANSLATIONS)
- unix: system(rm $$TRANSLATIONS)
-}
-
diff --git a/tests/auto/linguist/lupdate/testdata/good/parsecpp2/project.pro b/tests/auto/linguist/lupdate/testdata/good/parsecpp2/project.pro
index ff4dbd2..759bea0 100644
--- a/tests/auto/linguist/lupdate/testdata/good/parsecpp2/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/parsecpp2/project.pro
@@ -1,9 +1,3 @@
SOURCES = main.cpp
TRANSLATIONS = project.ts
-
-exists( $$TRANSLATIONS ) {
- win32: system(del $$TRANSLATIONS)
- unix: system(rm $$TRANSLATIONS)
-}
-
diff --git a/tests/auto/linguist/lupdate/testdata/good/parsejava/project.pro b/tests/auto/linguist/lupdate/testdata/good/parsejava/project.pro
index 2032674..657b535 100644
--- a/tests/auto/linguist/lupdate/testdata/good/parsejava/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/parsejava/project.pro
@@ -1,9 +1,3 @@
SOURCES += main.java
TRANSLATIONS = project.ts
-
-exists( $$TRANSLATIONS ) {
- win32: system(del $$TRANSLATIONS)
- unix: system(rm $$TRANSLATIONS)
-}
-
diff --git a/tests/auto/linguist/lupdate/testdata/good/parseui/project.pro b/tests/auto/linguist/lupdate/testdata/good/parseui/project.pro
index 9ae812c..fa56972 100644
--- a/tests/auto/linguist/lupdate/testdata/good/parseui/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/parseui/project.pro
@@ -1,10 +1,3 @@
FORMS += project.ui
TRANSLATIONS = project.ts
-
-exists( $$TRANSLATIONS ) {
- win32 : system(del $$TRANSLATIONS)
- unix : system(rm $$TRANSLATIONS)
-}
-
-
diff --git a/tests/auto/linguist/lupdate/testdata/good/prefix/project.pro b/tests/auto/linguist/lupdate/testdata/good/prefix/project.pro
index ff4dbd2..759bea0 100644
--- a/tests/auto/linguist/lupdate/testdata/good/prefix/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/prefix/project.pro
@@ -1,9 +1,3 @@
SOURCES = main.cpp
TRANSLATIONS = project.ts
-
-exists( $$TRANSLATIONS ) {
- win32: system(del $$TRANSLATIONS)
- unix: system(rm $$TRANSLATIONS)
-}
-
diff --git a/tests/auto/linguist/lupdate/testdata/good/preprocess/project.pro b/tests/auto/linguist/lupdate/testdata/good/preprocess/project.pro
index a66306d..c96859b 100644
--- a/tests/auto/linguist/lupdate/testdata/good/preprocess/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/preprocess/project.pro
@@ -1,9 +1,3 @@
SOURCES += main.cpp
TRANSLATIONS = project.ts
-
-exists( $$TRANSLATIONS ) {
- win32: system(del $$TRANSLATIONS)
- unix: system(rm -f $$TRANSLATIONS)
-}
-
diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsing/project.pro b/tests/auto/linguist/lupdate/testdata/good/proparsing/project.pro
index 5282863..0e920f9 100644
--- a/tests/auto/linguist/lupdate/testdata/good/proparsing/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/proparsing/project.pro
@@ -29,9 +29,3 @@ if (exists($$member($$(PATH), 0))) {
}
TRANSLATIONS = project.ts
-
-exists( $$TRANSLATIONS ) {
- win32: system(del $$TRANSLATIONS)
- unix: system(rm -f $$TRANSLATIONS)
-}
-
diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsing2/project.pro b/tests/auto/linguist/lupdate/testdata/good/proparsing2/project.pro
index 92644e5..3dc4208 100644
--- a/tests/auto/linguist/lupdate/testdata/good/proparsing2/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/proparsing2/project.pro
@@ -31,9 +31,3 @@ win32: SOURCES += $$system(type files-cc.txt)
unix: SOURCES += $$system(cat files-cc.txt)
TRANSLATIONS = project.ts
-
-exists( $$TRANSLATIONS ) {
- win32: system(del $$TRANSLATIONS)
- unix: system(rm $$TRANSLATIONS)
-}
-
diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsingpaths/project.pro b/tests/auto/linguist/lupdate/testdata/good/proparsingpaths/project.pro
index 820b4fa..6bfe751 100644
--- a/tests/auto/linguist/lupdate/testdata/good/proparsingpaths/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/proparsingpaths/project.pro
@@ -3,8 +3,3 @@ SOURCES += file*.cpp filter.cpp non-existing.cpp
include(sub/sub.pri)
TRANSLATIONS = project.ts
-
-exists( $$TRANSLATIONS ) {
- win32: system(del $$TRANSLATIONS)
- unix: system(rm -f $$TRANSLATIONS)
-}
diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsingpri/project.pro b/tests/auto/linguist/lupdate/testdata/good/proparsingpri/project.pro
index 14a991f..5e23538 100644
--- a/tests/auto/linguist/lupdate/testdata/good/proparsingpri/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/proparsingpri/project.pro
@@ -7,8 +7,3 @@ include(relativity/relativity.pri)
message($$SOURCES)
TRANSLATIONS = project.ts
-
-exists( $$TRANSLATIONS ) {
- win32: system(del $$TRANSLATIONS)
- unix: system(rm $$TRANSLATIONS)
-}
diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsingsubdirs/sub1/sub1.pro b/tests/auto/linguist/lupdate/testdata/good/proparsingsubdirs/sub1/sub1.pro
index cf55f10..df18c5a 100644
--- a/tests/auto/linguist/lupdate/testdata/good/proparsingsubdirs/sub1/sub1.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/proparsingsubdirs/sub1/sub1.pro
@@ -1,8 +1,3 @@
SOURCES += main.cpp
TRANSLATIONS = ../project.ts
-
-exists( $$TRANSLATIONS ) {
- win32: system(del $$TRANSLATIONS)
- unix: system(rm -f $$TRANSLATIONS)
-}
diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsingsubs/project.pro b/tests/auto/linguist/lupdate/testdata/good/proparsingsubs/project.pro
index 668ecf4..f75a462 100644
--- a/tests/auto/linguist/lupdate/testdata/good/proparsingsubs/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/proparsingsubs/project.pro
@@ -1,7 +1,2 @@
TEMPLATE = subdirs
SUBDIRS = win mac unix common
-
-exists( project.ts ) {
- win32: system(del project.ts)
- unix: system(rm project.ts)
-}
diff --git a/tests/auto/linguist/lupdate/testdata/good/reloutput/project.pro b/tests/auto/linguist/lupdate/testdata/good/reloutput/project.pro
index 5d263ae..4e2e6ad 100644
--- a/tests/auto/linguist/lupdate/testdata/good/reloutput/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/reloutput/project.pro
@@ -1,9 +1,3 @@
SOURCES += main.cpp
TRANSLATIONS = translations/project.ts
-
-exists( $$TRANSLATIONS ) {
- win32: system(del $$TRANSLATIONS)
- unix: system(rm -f $$TRANSLATIONS)
-}
-
diff --git a/tests/auto/linguist/lupdate/testdata/good/textsimilarity/project.pro b/tests/auto/linguist/lupdate/testdata/good/textsimilarity/project.pro
index 9a0d55d..fa56972 100644
--- a/tests/auto/linguist/lupdate/testdata/good/textsimilarity/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/textsimilarity/project.pro
@@ -1,11 +1,3 @@
FORMS += project.ui
TRANSLATIONS = project.ts
-
-# Copy the ts to a temp file because:
-# 1. The depot file is usually read-only
-# 2. We don't want to modify the original file, since then it won't be possible to run the test twice
-# without reverting the original file again.
-
-win32: system(copy /Y project.ts.before $$TRANSLATIONS)
-unix: system(cp -f project.ts.before $$TRANSLATIONS && chmod a+w $$TRANSLATIONS)
diff --git a/tests/auto/linguist/lupdate/testlupdate.cpp b/tests/auto/linguist/lupdate/testlupdate.cpp
index d43fbc4..877959a 100644
--- a/tests/auto/linguist/lupdate/testlupdate.cpp
+++ b/tests/auto/linguist/lupdate/testlupdate.cpp
@@ -58,7 +58,6 @@ TestLUpdate::TestLUpdate()
childProc = 0;
QString binPath = QLibraryInfo::location(QLibraryInfo::BinariesPath);
m_cmdLupdate = binPath + QLatin1String("/lupdate");
- m_cmdQMake = binPath + QLatin1String("/qmake");
}
TestLUpdate::~TestLUpdate()
@@ -149,10 +148,3 @@ bool TestLUpdate::updateProFile(const QString &arguments)
QStringList args = arguments.split(QChar(' '));
return runChild( true, m_cmdLupdate, args );
}
-
-bool TestLUpdate::qmake()
-{
- QStringList args;
- args << "-r";
- return runChild(true, m_cmdQMake, args);
-}
diff --git a/tests/auto/linguist/lupdate/testlupdate.h b/tests/auto/linguist/lupdate/testlupdate.h
index 581e5e9..153d7ba 100644
--- a/tests/auto/linguist/lupdate/testlupdate.h
+++ b/tests/auto/linguist/lupdate/testlupdate.h
@@ -57,7 +57,6 @@ public:
void setWorkingDirectory( const QString &workDir);
bool run( const QString &commandline);
bool updateProFile( const QString &arguments);
- bool qmake();
QStringList getErrorMessages() {
return make_result;
}
@@ -66,7 +65,6 @@ public:
}
private:
QString m_cmdLupdate;
- QString m_cmdQMake;
QString m_workDir;
QProcess *childProc;
QStringList env_list;
diff --git a/tests/auto/linguist/lupdate/tst_lupdate.cpp b/tests/auto/linguist/lupdate/tst_lupdate.cpp
index 73ede2f..02bb71e 100644
--- a/tests/auto/linguist/lupdate/tst_lupdate.cpp
+++ b/tests/auto/linguist/lupdate/tst_lupdate.cpp
@@ -169,11 +169,9 @@ void tst_lupdate::good()
qDebug() << "Checking...";
- // qmake will delete the previous one, to ensure that we don't do any merging....
QString generatedtsfile(QLatin1String("project.ts"));
m_lupdate.setWorkingDirectory(dir);
- m_lupdate.qmake();
// look for a command
QString lupdatecmd;
QFile file(dir + "/lupdatecmd");
@@ -195,6 +193,11 @@ void tst_lupdate::good()
file.close();
}
+ QFile::remove(generatedtsfile);
+ QString beforetsfile = generatedtsfile + QLatin1String(".before");
+ if (QFile::exists(beforetsfile))
+ QVERIFY2(QFile::copy(beforetsfile, generatedtsfile), qPrintable(beforetsfile));
+
if (lupdatecmd.isEmpty())
lupdatecmd = QLatin1String("project.pro");
lupdatecmd.prepend("-silent ");