From a40d0bdf72d914628ab609e3db8230e6472a9af3 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Mon, 20 Apr 2015 16:47:53 +0200
Subject: Use OFFICEOTRON/ODFVALIDATOR determined by configure

Change-Id: I456669f15a659e144fc6ecad053cd0b929859424
---
 test/source/bootstrapfixture.cxx | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

(limited to 'test/source')

diff --git a/test/source/bootstrapfixture.cxx b/test/source/bootstrapfixture.cxx
index f6f100aefb3c..c27f22fb5c0b 100644
--- a/test/source/bootstrapfixture.cxx
+++ b/test/source/bootstrapfixture.cxx
@@ -156,15 +156,24 @@ void test::BootstrapFixture::validate(const OUString& rPath, test::ValidationFor
     (void)eFormat;
 
 #if HAVE_EXPORT_VALIDATION
-    OUString aValidator;
+    OUString var;
     if( eFormat == test::OOXML )
     {
-        aValidator = "officeotron ";
+        var = "OFFICEOTRON";
     }
     else
     {
-        aValidator = "odfvalidator ";
+        var = "ODFVALIDATOR";
     }
+    OUString aValidator;
+    oslProcessError e = osl_getEnvironment(var.pData, &aValidator.pData);
+    CPPUNIT_ASSERT_EQUAL_MESSAGE(
+        OUString("cannot get env var " + var).toUtf8().getStr(),
+        osl_Process_E_None, e);
+    CPPUNIT_ASSERT_MESSAGE(
+        OUString("empty get env var " + var).toUtf8().getStr(),
+        !aValidator.isEmpty());
+    aValidator += " ";
 
     utl::TempFile aOutput;
     aOutput.EnableKillingFile();
-- 
cgit v1.2.3