[commit: ghc] wip/makefile-test: testsuite: Remove directories that already exist when seeding extra_files (7844332)

git at git.haskell.org git at git.haskell.org
Mon Jan 21 03:56:01 UTC 2019


Repository : ssh://git@git.haskell.org/ghc

On branch  : wip/makefile-test
Link       : http://ghc.haskell.org/trac/ghc/changeset/7844332710c961e8df88693b854a2de4875988b3/ghc

>---------------------------------------------------------------

commit 7844332710c961e8df88693b854a2de4875988b3
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Sun Jan 20 22:36:22 2019 -0500

    testsuite: Remove directories that already exist when seeding extra_files
    
    Otherwise the testsuite driver crashes when run multiple times with CLEANUP=NO
    on a test containing such extra_files.


>---------------------------------------------------------------

7844332710c961e8df88693b854a2de4875988b3
 testsuite/driver/testlib.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/testsuite/driver/testlib.py b/testsuite/driver/testlib.py
index c09d02a..d1ab41d 100644
--- a/testsuite/driver/testlib.py
+++ b/testsuite/driver/testlib.py
@@ -881,6 +881,8 @@ def do_test(name, way, func, args, files):
         if os.path.isfile(src):
             link_or_copy_file(src, dst)
         elif os.path.isdir(src):
+            if os.path.exists(dst):
+                shutil.rmtree(dst)
             os.mkdir(dst)
             lndir(src, dst)
         else:



More information about the ghc-commits mailing list