From a212844f6785f896b268b678f0018528c0ecfdc7 Mon Sep 17 00:00:00 2001 From: Steve Reinhardt Date: Fri, 3 Jan 2014 17:08:44 -0800 Subject: [PATCH] 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. --- configs/common/FSConfig.py | 1 + tests/configs/x86_generic.py | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/common/FSConfig.py b/configs/common/FSConfig.py index 780e4314c..8905ba2fa 100644 --- a/configs/common/FSConfig.py +++ b/configs/common/FSConfig.py @@ -518,6 +518,7 @@ def makeLinuxX86System(mem_mode, numCPUs = 1, mdesc = None, # Command line self.boot_osflags = 'earlyprintk=ttyS0 console=ttyS0 lpj=7999923 ' + \ 'root=/dev/hda1' + self.kernel = binary('x86_64-vmlinux-2.6.22.9') return self 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 -- 2.30.2