Attachment 881585 Details for Bug 1083333 – patch removing logging of /proc/cpuinfo and call to "tree"

[patch] patch removing logging of /proc/cpuinfo and call to "tree"

0001-1083333-ppc64-traceback-after-core-test.patch (text/plain), 4.61 KB, created by Greg Nichols on 2014-04-02 02:19:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Greg Nichols

Created: 2014-04-02 02:19:04 UTC

Size: 4.61 KB

patch

obsolete

>From e7c347e2a7a1f70cfeebb22d83987ecf549d9310 Mon Sep 17 00:00:00 2001
>From: Greg Nichols <gnichols@redhat.com>
>Date: Tue, 1 Apr 2014 22:17:53 -0400
>Subject: [PATCH] 1083333 - ppc64 traceback after core test
>
>---
> tests/core/CORE2    | 47 -----------------------------------------------
> tests/core/Makefile | 12 ++++--------
> tests/core/core.py  | 31 +++++--------------------------
> 3 files changed, 9 insertions(+), 81 deletions(-)
> delete mode 100755 tests/core/CORE2
>
>diff --git a/tests/core/CORE2 b/tests/core/CORE2
>deleted file mode 100755
>index 5935195..0000000
>--- a/tests/core/CORE2
>+++ /dev/null
>@@ -1,47 +0,0 @@
>-#!/bin/bash
>-# Copyright (C) 2005 Red Hat, Inc. All Rights Reserved.
>-# This program is free software; you can redistribute it and/or
>-# modify it under the terms of the GNU General Public License
>-# as published by the Free Software Foundation; either version 2
>-# of the License, or (at your option) any later version.
>-# 
>-# This program is distributed in the hope that it will be useful,
>-# but WITHOUT ANY WARRANTY; without even the implied warranty of 
>-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
>-# GNU General Public License for more details.
>-# 
>-# You should have received a copy of the GNU General Public License
>-# along with this program; if not, write to the Free Software
>-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
>-
>-# YK: grab CPU info on IA64 and PPC64
>-ARCH=`arch`
>-if [ $ARCH == "ia64" ]; then
>-    echo "+----------ia64 CPU info start----------+ "
>-    echo "+-----CPU Frequency-----+"
>-    cat /proc/cpuinfo | sed -e '/processor/b' -e '/cpu MHz/b' -e d
>-    echo ""
>-    for CPU in `ls /proc/pal/`; do
>-        echo "+-----$CPU cache-----+"
>-        cat /proc/pal/$CPU/cache_info  | sed -e '/Cache/b' -e '/Size/b' -e d
>-        echo ""
>-    done
>-    echo "+----------ia64 CPU info end----------+ "
>-    echo ""
>-fi
>-if [ $ARCH == "ppc64" ]; then
>-    echo "+----------ppc64 CPU info start----------+ "
>-    echo "+-----/proc/cpuinfo-----+"
>-    cat /proc/cpuinfo
>-    echo ""
>-    echo "+-----/proc/device-tree/cpus-----+"
>-    tree /proc/device-tree/cpus | grep Power
>-    echo ""
>-    echo "+----------ppc64 CPU info end----------+ "
>-    echo ""
>-fi
>-
>-exit 0
>-
>-
>-
>diff --git a/tests/core/Makefile b/tests/core/Makefile
>index c29cd14..a5096fb 100644
>--- a/tests/core/Makefile
>+++ b/tests/core/Makefile
>@@ -1,5 +1,5 @@
> # CoreOS/dummy
>-TOPLEVEL_NAMESPACE=/HWCERT
>+TOPLEVEL_NAMESPACE=/hwcert
> 
> # The name of the package under test:
> PACKAGE_NAME=hwcert-client
>@@ -15,17 +15,13 @@ export TEST=$(TOPLEVEL_NAMESPACE)/$(PACKAGE_NAME)/$(RELATIVE_PATH)
> 
> .PHONY: all install download clean
> 
>-BUILT_FILES= clocktest
>-FILES=clocktest.c CORE2 core.py
>+BUILT_FILES= clocktest 
>+FILES=clocktest.c  core.py
> 
> run: $(FILES) build
> 
> build: $(BUILT_FILES)
>-	chmod a+x ./CORE2 ./core.py
>-
>-clean:
>-	rm -f $(BUILT_FILES)
>-
>+	chmod a+x ./core.py
> 
> CFLAGS+=-Wall
> CFLAGS+=-DCPU_ALLOC
>diff --git a/tests/core/core.py b/tests/core/core.py
>index 27f2a5b..a8dcc6d 100644
>--- a/tests/core/core.py
>+++ b/tests/core/core.py
>@@ -87,26 +87,8 @@ class CoreTest(Test):
>                 return True
>             return False
>         except HwCertCommandException, e:
>-            
>             return False
>-        
>-        
>-    
>-    def runCORE2(self):
>-        # run the old CORE2 script
>-        try: 
>-            # run script for extra cpu stuff (ia64 and ppc64
>-            if self.redHatRelease.getArch() in ["ia64", "ppc64"]:
>-                core2 = Command("./CORE2")
>-                core2.echo()
>-        except HwCertCommandException, e:
>-            print "Error:"
>-            print e
>-            e.command.printErrors()
>-            return False
>-        
>-        return True
>-    
>+
>     def runClockTest(self):
>         try:
>             # run clock tests - jitter and direction
>@@ -162,18 +144,15 @@ class CoreTest(Test):
>         if not self.runSubTest(self.getMemoryInfo, name="Limits", description="Get test parameters based on hardware"):
>             print "Error: could not determine memory limits, using default settings"
>             result = FAIL
>-            
>-        if not self.runSubTest(self.runCORE2, name="CORE2", description="Run CORE2 script for cpu info"):
>-            result = FAIL
>-            
>+
>         if not self.runSubTest(self.runClockTest, name="clocktest", description="Clock tests"):
>             result = FAIL
>-            
>+
>         if not self.runSubTest(self.runStress, name="Stress"):            
>             result = FAIL
>-            
>+
>         return result
>-    
>+
> if __name__ == "__main__":
>     test = CoreTest()
>     returnValue = test.do(sys.argv)
>-- 
>1.8.5.3
>

Actions: View | Diff

Attachments on bug 1083333: 881585