From: Daniel R. Carvalho <odanrc@yahoo.com.br>
Date: Wed, 1 May 2019 20:53:29 +0000 (+0200)
Subject: tests: Add missing kernels to system creation
X-Git-Tag: v19.0.0.0~903
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=308a06c1d7ec5370e2f2f3a872951e9cac6fd65f;p=gem5.git

tests: Add missing kernels to system creation

Change 149c1fc2d070a8ce073263880ecf2ccf7535e569 removed the
default value of the kernels, and fs tests rely on those.

Change-Id: I6d83420af5881ab59c2d223a9915f363dd8a1c69
Signed-off-by: Daniel R. Carvalho <odanrc@yahoo.com.br>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/18528
Reviewed-by: Gabe Black <gabeblack@google.com>
Maintainer: Gabe Black <gabeblack@google.com>
Tested-by: kokoro <noreply+kokoro@google.com>
---

diff --git a/tests/configs/alpha_generic.py b/tests/configs/alpha_generic.py
index a5be4f205..3547f6973 100644
--- a/tests/configs/alpha_generic.py
+++ b/tests/configs/alpha_generic.py
@@ -40,7 +40,7 @@ import m5
 from m5.objects import *
 from m5.proxy import *
 m5.util.addToPath('../configs/')
-from common import FSConfig
+from common import FSConfig, SysPaths
 from common.Caches import *
 from base_config import *
 
@@ -60,6 +60,7 @@ class LinuxAlphaSystemBuilder(object):
 
     def create_system(self):
         system = FSConfig.makeLinuxAlphaSystem(self.mem_mode)
+        system.kernel = SysPaths.binary('vmlinux')
         self.init_system(system)
         return system
 
diff --git a/tests/configs/pc-simple-timing-ruby.py b/tests/configs/pc-simple-timing-ruby.py
index 18c990930..ffac06266 100644
--- a/tests/configs/pc-simple-timing-ruby.py
+++ b/tests/configs/pc-simple-timing-ruby.py
@@ -30,7 +30,7 @@ import m5, os, optparse, sys
 from m5.objects import *
 m5.util.addToPath('../configs/')
 from common.Benchmarks import SysConfig
-from common import FSConfig
+from common import FSConfig, SysPaths
 from ruby import Ruby
 from common import Options
 
@@ -54,6 +54,7 @@ options.num_cpus = 2
 mdesc = SysConfig(disk = 'linux-x86.img')
 system = FSConfig.makeLinuxX86System('timing', options.num_cpus,
                                      mdesc=mdesc, Ruby=True)
+system.kernel = SysPaths.binary('x86_64-vmlinux-2.6.22.9')
 # Dummy voltage domain for all our clock domains
 system.voltage_domain = VoltageDomain(voltage = options.sys_voltage)
 
diff --git a/tests/configs/twosys-tsunami-simple-atomic.py b/tests/configs/twosys-tsunami-simple-atomic.py
index 7d0768e53..3892745bf 100644
--- a/tests/configs/twosys-tsunami-simple-atomic.py
+++ b/tests/configs/twosys-tsunami-simple-atomic.py
@@ -29,11 +29,11 @@
 import m5
 from m5.objects import *
 m5.util.addToPath('../configs/')
-from common.FSConfig import *
-from common.Benchmarks import *
+from common import Benchmarks, FSConfig, SysPaths
 
 test_sys = makeLinuxAlphaSystem('atomic',
                                 SysConfig('netperf-stream-client.rcS'))
+test_sys.kernel = SysPaths.binary('vmlinux')
 
 # Dummy voltage domain for all test_sys clock domains
 test_sys.voltage_domain = VoltageDomain()
@@ -70,6 +70,7 @@ test_sys.physmem.port = test_sys.membus.master
 
 drive_sys = makeLinuxAlphaSystem('atomic',
                                  SysConfig('netperf-server.rcS'))
+drive_sys.kernel = SysPaths.binary('vmlinux')
 # Dummy voltage domain for all drive_sys clock domains
 drive_sys.voltage_domain = VoltageDomain()
 # Create the system clock domain
diff --git a/tests/configs/x86_generic.py b/tests/configs/x86_generic.py
index 53c046a58..e280fc59c 100644
--- a/tests/configs/x86_generic.py
+++ b/tests/configs/x86_generic.py
@@ -41,7 +41,7 @@ from m5.objects import *
 from m5.proxy import *
 m5.util.addToPath('../configs/')
 from common.Benchmarks import SysConfig
-from common import FSConfig
+from common import FSConfig, SysPaths
 from common.Caches import *
 from base_config import *
 
@@ -60,6 +60,7 @@ class LinuxX86SystemBuilder(object):
         system = FSConfig.makeLinuxX86System(self.mem_mode,
                                              numCPUs=self.num_cpus,
                                              mdesc=mdesc)
+        system.kernel = SysPaths.binary('x86_64-vmlinux-2.6.22.9')
 
         self.init_system(system)
         return system