diff options
| author | Tor Lillqvist <tml@collabora.com> | 2016-10-27 12:25:09 +0300 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2016-10-28 11:48:48 +0000 |
| commit | d9c7b0b260b8eb52c321794e4f89ca1ea6cd5a48 (patch) | |
| tree | 2a77ec170958ffab5a0660860dfca4e05279d6b1 /basic | |
| parent | 541febffd9d6f367e23081a1f0d095f232325014 (diff) | |
Bypass VBATest::testMiscOLEStuff() in a 64-bit Windows build for now
It fails when Excel is installed, for some reason:
Basic error:
Type: com.sun.star.uno.RuntimeException
Message: [automation bridge] unexpected exception in IUnknownWrapper_Impl::invoke ! Message :
[automation bridge]: [Microsoft][ODBC Driver Manager] Data source name not found and no default driver specified
macro result for ole_ObjAssignNoDflt.vb
macro returned:
C:/cygwin64/home/Tor/lo/64bit-debug/basic/qa/cppunit/test_vba.cxx:155:`anonymous namespace'::VBATest::testMiscOLEStuff
assertion failed
- Expression: pReturn->GetOUString() == "OK"
- Result not as expected
Note that this test returns early if Excel is not installed, so it is
effectively not performed anyway even in 32-bit builds on most (any?)
Jenkins and tinderbox machines.
Change-Id: I0a0b6f27219dec116369fae1bb7c95b3e9597e77
Reviewed-on: https://gerrit.libreoffice.org/30329
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'basic')
| -rw-r--r-- | basic/qa/cppunit/test_vba.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/basic/qa/cppunit/test_vba.cxx b/basic/qa/cppunit/test_vba.cxx index 83d243d21dc0..645bb2667026 100644 --- a/basic/qa/cppunit/test_vba.cxx +++ b/basic/qa/cppunit/test_vba.cxx @@ -87,8 +87,10 @@ void VBATest::testMiscVBAFunctions() void VBATest::testMiscOLEStuff() { -// not much point even trying to run except on windows -#if defined(_WIN32) +// Not much point even trying to run except on Windows. Does not work +// on 64-bit Windows with Excel installed. (Without Excel doesn't +// really do anything anyway, see "so skip test" below.) +#if defined(_WIN32) && !defined(_WIN64) // test if we have the necessary runtime environment // to run the OLE tests. uno::Reference< lang::XMultiServiceFactory > xOLEFactory; |