From: John Wolfe <jwolfe@vmware.com>
Date: Wed, 23 Dec 2020 15:33:50 +0000 (-0800)
Subject: OVT: Build only fuse-based or kernel module vmblocktest programs.
X-Git-Tag: stable-11.2.5~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b126b69245546cdfcde0e49fb10ccbb127d95b9c;p=thirdparty%2Fopen-vm-tools.git

OVT: Build only fuse-based or kernel module vmblocktest programs.

The OVT configuration determines whether open-vm-tools will build
a vmblock kernel module or a vmblock-fuse user level VMBlock
implementation.  Both versions of the vmblocktest program(s) are not
needed.   Linux OVT is only using the vmblock-fuse implementation.

Select the version to build based on the HAVE_FUSE setting from the
./configure run.

This fixes https://github.com/vmware/open-vm-tools/issues/467
---

diff --git a/open-vm-tools/tests/testVmblock/Makefile.am b/open-vm-tools/tests/testVmblock/Makefile.am
index b2ae31eff..f4ac11da8 100644
--- a/open-vm-tools/tests/testVmblock/Makefile.am
+++ b/open-vm-tools/tests/testVmblock/Makefile.am
@@ -15,12 +15,12 @@
 ### Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ################################################################################
 
-noinst_PROGRAMS = vmware-testvmblock-legacy
-noinst_PROGRAMS += vmware-testvmblock-manual-legacy
-
 if HAVE_FUSE
-  noinst_PROGRAMS += vmware-testvmblock-fuse
+  noinst_PROGRAMS = vmware-testvmblock-fuse
   noinst_PROGRAMS += vmware-testvmblock-manual-fuse
+else
+  noinst_PROGRAMS = vmware-testvmblock-legacy
+  noinst_PROGRAMS += vmware-testvmblock-manual-legacy
 endif
 
 AM_CFLAGS =