From fd35ddd3e1cf16876bbc57d29c7472e551304f0f Mon Sep 17 00:00:00 2001
From: Michael Stahl <mstahl@redhat.com>
Date: Thu, 11 Sep 2014 16:35:06 +0200
Subject: 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
---
 smoketest/data/Basic/Standard/Test_10er.xml | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

(limited to 'smoketest/data')

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
+
+    &apos; 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, &quot;Sequence of testing&quot;
 
+    if bMakeExtensionTest then
+        WriteExtensionTests (&quot;Extension   : &quot;, GlobalTestLog)
     if bMakeWriterTest then
         WriteTests (&quot;writer  : &quot;, true, GlobalTestLog)
     end if
@@ -235,8 +240,6 @@ Sub WriteTestSequence
     if bMakeDBTest then
         WriteDBTests (&quot;Database    : &quot;, GlobalTestLog)
     end if
-    if bMakeExtensionTest then
-        WriteExtensionTests (&quot;Extension   : &quot;, GlobalTestLog)
   end if
 
   Print #GlobalTestLog, &quot;testclosure : setup, write_status&quot;
-- 
cgit