summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2009-09-23 10:39:40 (GMT)
committerMiikka Heikkinen <miikka.heikkinen@digia.com>2009-09-23 10:39:40 (GMT)
commit77ac469063064a85cfec79fdc8d45cee0fa8e426 (patch)
treed461b80ba906d75e644cb939ada84a6a223d770f
parent55cb8b6d1765d1446ae046a54d98aceeba9d9146 (diff)
downloadQt-77ac469063064a85cfec79fdc8d45cee0fa8e426.zip
Qt-77ac469063064a85cfec79fdc8d45cee0fa8e426.tar.gz
Qt-77ac469063064a85cfec79fdc8d45cee0fa8e426.tar.bz2
Removed explicit TARGET.EPOCHEAPSIZE statements from script tests
Large enough max heap for script tests is now defined by default for all tests in qttest_p4.prf, so removed the statements from individual script tests. Reviewed-by: Janne Anttila
-rw-r--r--tests/auto/qscriptengine/qscriptengine.pro1
-rw-r--r--tests/auto/qscriptextqobject/qscriptextqobject.pro4
-rw-r--r--tests/auto/qscriptjstestsuite/qscriptjstestsuite.pro10
-rw-r--r--tests/auto/qscriptv8testsuite/qscriptv8testsuite.pro2
4 files changed, 4 insertions, 13 deletions
diff --git a/tests/auto/qscriptengine/qscriptengine.pro b/tests/auto/qscriptengine/qscriptengine.pro
index f72c070..d4c0f4c 100644
--- a/tests/auto/qscriptengine/qscriptengine.pro
+++ b/tests/auto/qscriptengine/qscriptengine.pro
@@ -12,5 +12,4 @@ wince*|symbian*: {
symbian: {
TARGET.UID3 = 0xE0340006
DEFINES += SYMBIAN_SRCDIR_UID=$$lower($$replace(TARGET.UID3,"0x",""))
- TARGET.EPOCHEAPSIZE="0x100000 0x1000000 // Min 1Mb, max 16Mb"
}
diff --git a/tests/auto/qscriptextqobject/qscriptextqobject.pro b/tests/auto/qscriptextqobject/qscriptextqobject.pro
index 9da7f47..140a4e6 100644
--- a/tests/auto/qscriptextqobject/qscriptextqobject.pro
+++ b/tests/auto/qscriptextqobject/qscriptextqobject.pro
@@ -1,7 +1,3 @@
load(qttest_p4)
QT = core gui script
SOURCES += tst_qscriptextqobject.cpp
-
-symbian: {
- TARGET.EPOCHEAPSIZE="0x100000 0x1000000 // Min 1Mb, max 16Mb"
-}
diff --git a/tests/auto/qscriptjstestsuite/qscriptjstestsuite.pro b/tests/auto/qscriptjstestsuite/qscriptjstestsuite.pro
index 06b861e..07a4672 100644
--- a/tests/auto/qscriptjstestsuite/qscriptjstestsuite.pro
+++ b/tests/auto/qscriptjstestsuite/qscriptjstestsuite.pro
@@ -1,12 +1,10 @@
load(qttest_p4)
QT = core script
SOURCES += tst_qscriptjstestsuite.cpp
-symbian {
- TARGET.EPOCHEAPSIZE = 0x020000 0xA00000
-} else {
- DEFINES += SRCDIR=\\\"$$PWD\\\"
-}
-wince*|symbian*: {
+
+!symbian: DEFINES += SRCDIR=\\\"$$PWD\\\"
+
+wince*|symbian: {
testFiles.sources = tests
testFiles.path = .
DEPLOYMENT += testFiles
diff --git a/tests/auto/qscriptv8testsuite/qscriptv8testsuite.pro b/tests/auto/qscriptv8testsuite/qscriptv8testsuite.pro
index 3f641b5..03e26bd 100644
--- a/tests/auto/qscriptv8testsuite/qscriptv8testsuite.pro
+++ b/tests/auto/qscriptv8testsuite/qscriptv8testsuite.pro
@@ -8,5 +8,3 @@ testFiles.sources = tests
testFiles.path = .
DEPLOYMENT += testFiles
}
-
-symbian:TARGET.EPOCHEAPSIZE = 0x00020000 0x02000000