diff options
-rw-r--r-- | meta/lib/oeqa/selftest/cases/devtool.py | 6 | ||||
-rw-r--r-- | meta/lib/oeqa/selftest/cases/recipetool.py | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/meta/lib/oeqa/selftest/cases/devtool.py b/meta/lib/oeqa/selftest/cases/devtool.py index 5886862d6c..5003f08c75 100644 --- a/meta/lib/oeqa/selftest/cases/devtool.py +++ b/meta/lib/oeqa/selftest/cases/devtool.py | |||
@@ -1447,7 +1447,11 @@ class DevtoolUpgradeTests(DevtoolBase): | |||
1447 | dstdir = os.path.join(dstdir, p) | 1447 | dstdir = os.path.join(dstdir, p) |
1448 | if not os.path.exists(dstdir): | 1448 | if not os.path.exists(dstdir): |
1449 | os.makedirs(dstdir) | 1449 | os.makedirs(dstdir) |
1450 | self.track_for_cleanup(dstdir) | 1450 | if p == "lib": |
1451 | # Can race with other tests | ||
1452 | self.add_command_to_tearDown('rmdir --ignore-fail-on-non-empty %s' % dstdir) | ||
1453 | else: | ||
1454 | self.track_for_cleanup(dstdir) | ||
1451 | dstfile = os.path.join(dstdir, os.path.basename(srcfile)) | 1455 | dstfile = os.path.join(dstdir, os.path.basename(srcfile)) |
1452 | if srcfile != dstfile: | 1456 | if srcfile != dstfile: |
1453 | shutil.copy(srcfile, dstfile) | 1457 | shutil.copy(srcfile, dstfile) |
diff --git a/meta/lib/oeqa/selftest/cases/recipetool.py b/meta/lib/oeqa/selftest/cases/recipetool.py index 6bfe8f177f..c2ade2543a 100644 --- a/meta/lib/oeqa/selftest/cases/recipetool.py +++ b/meta/lib/oeqa/selftest/cases/recipetool.py | |||
@@ -534,7 +534,11 @@ class RecipetoolTests(RecipetoolBase): | |||
534 | dstdir = os.path.join(dstdir, p) | 534 | dstdir = os.path.join(dstdir, p) |
535 | if not os.path.exists(dstdir): | 535 | if not os.path.exists(dstdir): |
536 | os.makedirs(dstdir) | 536 | os.makedirs(dstdir) |
537 | self.track_for_cleanup(dstdir) | 537 | if p == "lib": |
538 | # Can race with other tests | ||
539 | self.add_command_to_tearDown('rmdir --ignore-fail-on-non-empty %s' % dstdir) | ||
540 | else: | ||
541 | self.track_for_cleanup(dstdir) | ||
538 | dstfile = os.path.join(dstdir, os.path.basename(srcfile)) | 542 | dstfile = os.path.join(dstdir, os.path.basename(srcfile)) |
539 | if srcfile != dstfile: | 543 | if srcfile != dstfile: |
540 | shutil.copy(srcfile, dstfile) | 544 | shutil.copy(srcfile, dstfile) |