GreenPolyProducts/cantera
5
0
Fork 0
mirror of https://github.com/Cantera/cantera.git synced 2026-08-19 01:14:44 -05:00
Code Issues Packages Projects Releases Wiki Activity

[Test] Clean up all compiler intermediates in test_problems

Browse Source 
Some of the build files in the test_problems folder were not being
cleaned by scons test-clean. This seems to be because they were not the
same name as the executable.
This commit is contained in:
Ray Speth
2020-06-10 22:00:12 -04:00
parent 87a0af00b8
commit ceeee5cf43
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test_problems/SConscript
+6 -4
View File
@@ -126,19 +126,21 @@ class CompileAndTest(Test):
**kwargs): **kwargs):
self.extensions = kwargs.get('extensions') or ('cpp',) self.extensions = kwargs.get('extensions') or ('cpp',)
self.libs = list(libs) self.libs = list(libs)
self.sources = mglob(env, subdir, *self.extensions)
Test.__init__(self, testName, subdir, programName, blessedName, **kwargs) Test.__init__(self, testName, subdir, programName, blessedName, **kwargs)
def run(self, env): def run(self, env):
prog = env.Program(pjoin(self.subdir, self.programName), prog = env.Program(pjoin(self.subdir, self.programName),
mglob(env, self.subdir, *self.extensions), self.sources,
LIBS=self.libs or cantera_libs) LIBS=self.libs or cantera_libs)
source = [prog] source = [prog]
return Test.run(self, env, *source) return Test.run(self, env, *source)
def clean(self, env): def clean(self, env):
files = [self.programName + ext basenames = [os.path.splitext(f.name)[0] for f in self.sources]
for ext in ['', '.o', '.exe', '.exe.manifest', '.ilk', basenames.append(self.programName)
'.obj', '.pdb']] exts = ['', '.o', '.exe', '.exe.manifest', '.ilk', '.obj', '.pdb', '.obj.pdb']
files = [name + ext for name in basenames for ext in exts]
return Test.clean(self, env, files=files) return Test.clean(self, env, files=files)