From 0740127f4d59564a8bdb64c59fb4f5c2357350f9 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Mon, 1 Dec 2014 17:33:56 -0700 Subject: buildman: Don't remove entire output directory when testing When running tests the output directory is often wiped. This is only safe if a branch is being built. The output directory may contain other things besides the buildman test output. Signed-off-by: Simon Glass --- tools/buildman/control.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'tools') diff --git a/tools/buildman/control.py b/tools/buildman/control.py index 747c80d76a..2249b0f700 100644 --- a/tools/buildman/control.py +++ b/tools/buildman/control.py @@ -215,7 +215,8 @@ def DoBuildman(options, args, toolchains=None, make_func=None, boards=None, # output directory itself rather than any subdirectory. if not options.no_subdirs: output_dir = os.path.join(options.output_dir, dirname) - if clean_dir and os.path.exists(output_dir): + if (clean_dir and output_dir != options.output_dir and + os.path.exists(output_dir)): shutil.rmtree(output_dir) builder = Builder(toolchains, output_dir, options.git_dir, options.threads, options.jobs, gnu_make=gnu_make, checkout=True, -- cgit v1.2.1