diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-09-11 16:35:06 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-09-11 16:45:40 +0200 |
| commit | fd35ddd3e1cf16876bbc57d29c7472e551304f0f (patch) | |
| tree | efcec6b9272c649445952042316aecd4f4d0d882 | |
| parent | shell: sal_Bool -> bool (diff) | |
| download | core-fd35ddd3e1cf16876bbc57d29c7472e551304f0f.tar.gz core-fd35ddd3e1cf16876bbc57d29c7472e551304f0f.zip | |
smoketest: run the extension test first
With clang 3.4 ASAN there is the problem that the smoketest fails if run
in "make check" while trying to start the JVM, in getJavaProps()
it forks a "java" process and that fails due to lack of memory.
Avoid that problem by running the extension test first, when there is
only one application loaded, so the process is using much less memory.
Change-Id: I7e8bdc6ceea65b212f376943c7814ad1cf28675d
| -rw-r--r-- | smoketest/data/Basic/Standard/Test_10er.xml | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/smoketest/data/Basic/Standard/Test_10er.xml b/smoketest/data/Basic/Standard/Test_10er.xml index 534abe00fc44..67e5e40c16d7 100644 --- a/smoketest/data/Basic/Standard/Test_10er.xml +++ b/smoketest/data/Basic/Standard/Test_10er.xml @@ -160,6 +160,13 @@ DIM nStrPos as Long GlobalTestLog = OpenLogDat (sLogFileName) call WriteTestSequence + + ' Do extension test first to avoid OOM with ASAN + if bMakeExtensionTest then + gCurrentDocTest = frmExtension + call Test_Ext.TestExtensions + end if + if bMakeWriterTest then gCurrentDocTest = frmWriter call MakeDocTest @@ -196,10 +203,6 @@ DIM nStrPos as Long gCurrentDocTest = frmDataBase call Test_DB.TestDB end if - if bMakeExtensionTest then - gCurrentDocTest = frmExtension - call Test_Ext.TestExtensions - end if Close #GlobalTestLog GlobalTestLog = 0 @@ -208,6 +211,8 @@ end Sub Sub WriteTestSequence Print #GlobalTestLog, "Sequence of testing" + if bMakeExtensionTest then + WriteExtensionTests ("Extension : ", GlobalTestLog) if bMakeWriterTest then WriteTests ("writer : ", true, GlobalTestLog) end if @@ -235,8 +240,6 @@ Sub WriteTestSequence if bMakeDBTest then WriteDBTests ("Database : ", GlobalTestLog) end if - if bMakeExtensionTest then - WriteExtensionTests ("Extension : ", GlobalTestLog) end if Print #GlobalTestLog, "testclosure : setup, write_status" |