diff options
| author | David Ostrovsky <david@ostrovsky.org> | 2014-12-08 08:23:08 +0100 |
|---|---|---|
| committer | David Ostrovsky <david@ostrovsky.org> | 2015-01-10 21:40:38 +0000 |
| commit | 949ee4fe12c6e9659aa6a06bc5a094a1bc141ddd (patch) | |
| tree | fe544f83ed225efd706f04492487a3bcd10475bb | |
| parent | 2ce00302275f8676decbdfe919590bb215b1c134 (diff) | |
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 <david@ostrovsky.org>
Tested-by: David Ostrovsky <david@ostrovsky.org>
| -rw-r--r-- | connectivity/Module_connectivity.mk | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/connectivity/Module_connectivity.mk b/connectivity/Module_connectivity.mk index 210a4774dd0e..46b030d6cd67 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,\ |