summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorSteve Reinhardt <steve.reinhardt@amd.com>2014-01-03 17:08:44 -0800
committerSteve Reinhardt <steve.reinhardt@amd.com>2014-01-03 17:08:44 -0800
commita212844f6785f896b268b678f0018528c0ecfdc7 (patch)
tree5317addf969158bcfb4ca81513b23b93f22aa913 /tests
parentd8c9b5431b05550ee3a232e95af50a5e3d9ce4b5 (diff)
downloadgem5-a212844f6785f896b268b678f0018528c0ecfdc7.tar.xz
config, x86: move kernel specification from tests to FSConfig.py
For some reason, the default x86 kernel is specified in tests/configs/x86_generic.py and not in configs/common/FSConfig.py, where the kernels for all the other ISAs are. This means that running configs/example/fs.py for x86 fails because no kernel is specified. Moving the specification over fixes this problem. There is another problem that this uncovers, which is that going past the init stage (i.e., past where the regression test stops) fails because the fsck test on the disk device fails, but that's a separate issue.
Diffstat (limited to 'tests')
-rw-r--r--tests/configs/x86_generic.py1
1 files changed, 0 insertions, 1 deletions
diff --git a/tests/configs/x86_generic.py b/tests/configs/x86_generic.py
index d30087df1..5dc8702ba 100644
--- a/tests/configs/x86_generic.py
+++ b/tests/configs/x86_generic.py
@@ -60,7 +60,6 @@ class LinuxX86SystemBuilder(object):
system = FSConfig.makeLinuxX86System(self.mem_mode,
numCPUs=self.num_cpus,
mdesc=mdesc)
- system.kernel = FSConfig.binary('x86_64-vmlinux-2.6.22.9')
self.init_system(system)
return system