uname for machine name

uname -p is not portable - should use uname -m to retrieve machine name in user code Signed-off-by: Thierry <[email protected]>
kvaneesh · Jan 9, 2020 · ed0f6f2 · ed0f6f2
1 parent 216261b
commit ed0f6f2
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/perf/unixbench.py b/perf/unixbench.py
@@ -35,7 +35,7 @@ def setUp(self):
         self.tmpdir = data_dir.get_tmp_dir()
         self.report_data = self.err = None
         self.build_dir = self.params.get('build_dir', default=self.tmpdir)
-        for package in ['gcc', 'make']:
+        for package in ['gcc', 'make', 'patch']:
             if not smm.check_installed(package) and not smm.install(package):
                 self.cancel('%s is needed for the test to be run' % package)
         url = 'https://github.com/kdlucas/byte-unixbench/archive/master.zip'
@@ -45,6 +45,8 @@ def setUp(self):
         self.sourcedir = os.path.join(self.workdir,
                                       "byte-unixbench-master/UnixBench")
         os.chdir(self.sourcedir)
+        makefile_patch = 'patch -p0 < %s' % self.get_data('make1.patch')
+        process.run(makefile_patch, shell=True)
         build.make(self.sourcedir)
 
     def test(self):

diff --git a/perf/unixbench.py.data/make1.patch b/perf/unixbench.py.data/make1.patch
@@ -0,0 +1,11 @@
+--- Makefile.orig   2020-01-09 18:35:13.509293580 +0100
++++ Makefile    2020-01-09 18:33:49.723976623 +0100
+@@ -89,7 +89,7 @@
+
+   ## OS detection.  Comment out if gmake syntax not supported by other 'make'. 
+   OSNAME:=$(shell uname -s)
+-  ARCH := $(shell uname -p)
++  ARCH := $(shell uname -m)
+   ifeq ($(OSNAME),Linux)
+     # Not all CPU architectures support "-march" or "-march=native".
+     #   - Supported    : x86, x86_64, ARM, AARCH64, etc..