connectivity/Module_connectivity.mk | 2 ++
1 file changed, 2 insertions(+)
New commits:
commit 949ee4fe12c6e9659aa6a06bc5a094a1bc141ddd
Author: David Ostrovsky <da...@ostrovsky.org>
Date: Mon Dec 8 08:23:08 2014 +0100
Disable ado unit test on x86_64 platform on windows
ADO is not available on 64bit.
Change-Id: Iaad115219eac0051346b99ecb9076e29d528df2b
Reviewed-on: https://gerrit.libreoffice.org/13367
Reviewed-by: David Ostrovsky <da...@ostrovsky.org>
Tested-by: David Ostrovsky <da...@ostrovsky.org>
diff --git a/connectivity/Module_connectivity.mk
b/connectivity/Module_connectivity.mk
index 210a477..46b030d 100644
--- a/connectivity/Module_connectivity.mk
+++ b/connectivity/Module_connectivity.mk
@@ -142,11 +142,13 @@ ifeq ($(OS),WNT)
#Assertion failed: this->is_initialized(), file
C:\cygwin\home\buildslave\build\workdir\wntmsci14.pro\UnpackedTarball\boost\boost/optional/optional.hpp,
line 638
ifneq ($(VCVER)_$(WINDOWS_SDK_VERSION),110_70)
+ifneq ($(CPUNAME),X86_64)
$(eval $(call gb_Module_add_check_targets,connectivity,\
CppunitTest_connectivity_ado \
))
endif
endif
+endif
ifneq ($(filter QADEVOOO,$(BUILD_TYPE)),)
$(eval $(call gb_Module_add_subsequentcheck_targets,connectivity,\
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
