diff options
| author | Karel Kočí <cynerd@email.cz> | 2015-08-13 15:53:06 +0200 |
|---|---|---|
| committer | Karel Kočí <cynerd@email.cz> | 2015-08-13 15:53:06 +0200 |
| commit | b6abf4e8fe0c3b40305dfdd0410abfbf3c804874 (patch) | |
| tree | 0e63a8695c793e79ba1b64b6674002c02f514040 /scripts | |
| parent | a8c91e078ccb3780a53748cc52b7974bfc65b636 (diff) | |
| parent | 72316e351df5159384d70faa708224ff2fcc8dd2 (diff) | |
| download | linux-conf-perf-b6abf4e8fe0c3b40305dfdd0410abfbf3c804874.tar.gz linux-conf-perf-b6abf4e8fe0c3b40305dfdd0410abfbf3c804874.tar.bz2 linux-conf-perf-b6abf4e8fe0c3b40305dfdd0410abfbf3c804874.zip | |
Merge branch 'measuring'
Removing measuring branch. Idea was to make measuring configuration
separate from master. But keeping changes in master and measuring
branch consistent was pain.
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/boot.py | 3 | ||||
| -rw-r--r-- | scripts/configurations.py | 1 | ||||
| -rwxr-xr-x | scripts/from_folder | 2 | ||||
| -rw-r--r-- | scripts/nbscript | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/scripts/boot.py b/scripts/boot.py index 7ae30a9..2d1461a 100644 --- a/scripts/boot.py +++ b/scripts/boot.py @@ -29,7 +29,8 @@ def boot(config, to_database = True): value = None try: - out = utils.callsubprocess('parse_command', conf.parse_command, + out = utils.callsubprocess('parse_command', conf.parse_command + + [os.path.join(conf.output_folder, config.cfile)], conf.parse_output, True) value = float(out[0]) except Exception as e: diff --git a/scripts/configurations.py b/scripts/configurations.py index aef8a5f..3f2d15e 100644 --- a/scripts/configurations.py +++ b/scripts/configurations.py @@ -180,7 +180,6 @@ def __generate_single__(var_num, conf_num): for con in confs: __register_conf__(con, conf_num, 'single-sat') except exceptions.NoSolution: - os.remove(tfile) return __generate_single__(var_num, conf_num) finally: os.remove(tfile) diff --git a/scripts/from_folder b/scripts/from_folder index b72899f..8801a48 100755 --- a/scripts/from_folder +++ b/scripts/from_folder @@ -1,6 +1,6 @@ #!/bin/bash -FOLDER=linux/arch +FOLDER=linux/kernel CONF=`find $FOLDER -name Kconfig | xargs grep -e ^config | cut -d ' ' -f2` diff --git a/scripts/nbscript b/scripts/nbscript index ef99dd8..0f5ec55 100644 --- a/scripts/nbscript +++ b/scripts/nbscript @@ -1,4 +1,4 @@ #!/usr/bin/env novaboot # Novaboot script load ../jobfiles/linuxImage console=ttyS0,115200 -load ../buildroot/output/images/rootfs.cpio.gz +load ../root/cyclictest/images/rootfs.cpio.gz |