msetup: Restore .gitignore after wipe

pull/7079/head
Xavier Claessens 4 years ago committed by Eli Schwartz
parent b3a76fea64
commit d9b9eecd54
  1. 1
      mesonbuild/msetup.py
  2. 1
      run_unittests.py

@ -101,6 +101,7 @@ class MesonApp:
else: else:
mesonlib.windows_proof_rm(l) mesonlib.windows_proof_rm(l)
finally: finally:
self.add_vcs_ignore_files(self.build_dir)
for b, f in restore: for b, f in restore:
os.makedirs(os.path.dirname(f), exist_ok=True) os.makedirs(os.path.dirname(f), exist_ok=True)
shutil.move(b, f) shutil.move(b, f)

@ -4337,6 +4337,7 @@ class AllPlatformTests(BasePlatformTests):
self.assertRegex(out, 'opt2 val2') self.assertRegex(out, 'opt2 val2')
self.assertRegex(out, 'opt3 val3') self.assertRegex(out, 'opt3 val3')
self.assertRegex(out, 'opt4 val4') self.assertRegex(out, 'opt4 val4')
self.assertTrue(Path(self.builddir, '.gitignore').exists())
self.build() self.build()
self.run_tests() self.run_tests()

Loading…
Cancel
Save