Index: win-tests.py =================================================================== --- win-tests.py (revision 20240) +++ win-tests.py (working copy) @@ -94,6 +94,10 @@ else: abs_builddir = os.path.abspath(args[0]) create_dirs = 1 + +# Don't run bdb tests if they want to test fsfs +if fs_type == 'fsfs': + all_tests = gen_obj.test_progs + gen_obj.scripts if run_httpd: if not httpd_port: Index: subversion/svn_private_config.hw =================================================================== --- subversion/svn_private_config.hw (revision 20240) +++ subversion/svn_private_config.hw (working copy) @@ -36,9 +36,6 @@ /* Name of system's null device */ #define SVN_NULL_DEVICE_NAME "nul" -/* Link fs base library into the fs library */ -#define SVN_LIBSVN_FS_LINKS_FS_BASE - /* Link fs fs library into the fs library */ #define SVN_LIBSVN_FS_LINKS_FS_FS Index: build/generator/gen_win.py =================================================================== --- build/generator/gen_win.py (revision 20240) +++ build/generator/gen_win.py (working copy) @@ -238,11 +238,21 @@ # Don't create projects for scripts install_targets = filter(lambda x: not isinstance(x, gen_base.TargetScript), install_targets) + + # Drop the gen_uri_delims target unless we're on an old apr-util + if not self.have_gen_uri: + install_targets = filter(lambda x: x.name != 'gen_uri_delims', + install_targets) + + # Drop the libsvn_fs_base target and tests if we don't have BDB + if not self.bdb_lib: + install_targets = filter(lambda x: x.name != 'libsvn_fs_base', + install_targets) + install_targets = filter(lambda x: not (isinstance(x, gen_base.TargetExe) + and x.install == 'bdb-test'), + install_targets) for target in install_targets: - # drop the gen_uri_delims target unless we're on an old apr-util - if not self.have_gen_uri and target.name == 'gen_uri_delims': - install_targets.remove(target) if isinstance(target, gen_base.TargetLib) and target.msvc_fake: install_targets.append(self.create_fake_target(target)) @@ -587,6 +597,7 @@ # XXX: know these things for itself. if self.bdb_lib: fakedefines.append("APU_HAVE_DB=1") + fakedefines.append("SVN_LIBSVN_FS_LINKS_FS_BASE=1") # check if they wanted nls if self.enable_nls: @@ -667,7 +678,9 @@ def get_win_libs(self, target, cfg): "Return the list of external libraries needed for target" - dblib = self.bdb_lib+(cfg == 'Debug' and 'd.lib' or '.lib') + dblib = None + if self.bdb_lib: + dblib = self.bdb_lib+(cfg == 'Debug' and 'd.lib' or '.lib') neonlib = self.neon_lib+(cfg == 'Debug' and 'd.lib' or '.lib') zlib = (cfg == 'Debug' and 'zlibstatD.lib' or 'zlibstat.lib') @@ -836,9 +849,8 @@ self.bdb_lib = lib break else: - sys.stderr.write("DB not found; assuming db-4.2.x in db4-win32 " - "by default\n") - self.bdb_lib = "libdb42" + sys.stderr.write("BDB not found, BDB fs will not be built\n") + self.bdb_lib = None def _find_perl(self): "Find the right perl library name to link swig bindings with"