aboutsummaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorKarel Kočí <cynerd@email.cz>2015-08-13 11:54:31 +0200
committerKarel Kočí <cynerd@email.cz>2015-08-13 11:54:31 +0200
commit6193dece5f6fa1caf88612989bb908495d9ee6f7 (patch)
tree79400b7147cb7dc69fcd12195845660dd5cc95ae /scripts
parentfb3c8e339fb3896753f7130b8f8e34be8d89ae2e (diff)
parent5bf8e17c83d4b5500fd81edaee5c495161e1f0ba (diff)
downloadlinux-conf-perf-6193dece5f6fa1caf88612989bb908495d9ee6f7.tar.gz
linux-conf-perf-6193dece5f6fa1caf88612989bb908495d9ee6f7.tar.bz2
linux-conf-perf-6193dece5f6fa1caf88612989bb908495d9ee6f7.zip
Merge branch 'master' into measuring
Conflicts: conf.py scripts/configurations.py
Diffstat (limited to 'scripts')
-rw-r--r--scripts/configurations.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/configurations.py b/scripts/configurations.py
index 0a15d5f..a9ede05 100644
--- a/scripts/configurations.py
+++ b/scripts/configurations.py
@@ -171,16 +171,16 @@ def __generate_single__(var_num, conf_num):
if not measure_list:
return False
tfile = __buildtempcnf__(var_num, (sf(conf.rules_file),
- sf(conf.fixed_file)), [str(measure_list.pop())])
+ sf(conf.fixed_file)), (str(measure_list.pop())))
with open(sf(conf.single_generated_file), 'w') as fo:
- for ln in measure_list:
- fo.write(str(ln) + '\n')
+ fo.writelines(measure_list)
try:
confs = __exec_sat__(tfile, ['-i', '0'])
for con in confs:
__register_conf__(con, conf_num, 'single-sat')
except exceptions.NoSolution:
- __generate_single__(var_num, conf_num)
+ os.remove(tfile)
+ return __generate_single__(var_num, conf_num)
finally:
os.remove(tfile)
return True