[Libreoffice-commits] core.git: basic/qa

[Takeshi Abe]

 basic/qa/cppunit/test_vba.cxx |    4 +++-
 basic/qa/vba_tests/cdec.vb    |    2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 666901bc82fab69f9a80b564f97b5456d0ef684e
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date:   Mon May 15 19:06:42 2017 +0900

    basic: Test VBA's CDec() only on Windows
    
    since it is not implemented on others.
    
    Change-Id: If058207eb441caa65f93bbb554fe77cf469b1682
    Reviewed-on: https://gerrit.libreoffice.org/37631
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Takeshi Abe <tabe at fixedpoint.jp>

diff --git a/basic/qa/cppunit/test_vba.cxx b/basic/qa/cppunit/test_vba.cxx
index 64e4ffdc9fed..8b46d739f81d 100644
--- a/basic/qa/cppunit/test_vba.cxx
+++ b/basic/qa/cppunit/test_vba.cxx
@@ -43,7 +43,9 @@ void VBATest::testMiscVBAFunctions()
 {
     const char* macroSource[] = {
         "bytearraystring.vb",
-        "cdec.vb",
+#ifdef _WIN32
+        "cdec.vb", // currently CDec is implemented only on Windows
+#endif
         "constants.vb",
 // datevalue test seems to depend on both locale and language
 // settings, should try and rewrite the test to deal with that
diff --git a/basic/qa/vba_tests/cdec.vb b/basic/qa/vba_tests/cdec.vb
index 56166cae5a4e..af919a7cbd60 100644
--- a/basic/qa/vba_tests/cdec.vb
+++ b/basic/qa/vba_tests/cdec.vb
@@ -6,7 +6,7 @@ Dim result As String
 
 Function doUnitTest() As String
 result = verify_testCDec()
-If failCount <> 0 And passCount > 0 Then
+If failCount <> 0 Or passCount = 0 Then
     doUnitTest = result
 Else
     doUnitTest = "OK"