|
[Valgrind-developers] valgrind: r12593: Fix machine detection on
s390 to not bail out the regression
From: <sv...@va...> - 2012-05-29 11:02:47
|
cborntra 2012-05-29 12:02:28 +0100 (Tue, 29 May 2012)
New Revision: 12593
Log:
Fix machine detection on s390 to not bail out the regression
test on unknown systems.
Modified files:
trunk/tests/s390x_features.c
Modified: trunk/tests/s390x_features.c (+3 -2)
===================================================================
--- trunk/tests/s390x_features.c 2012-05-28 17:55:35 +01:00 (rev 12592)
+++ trunk/tests/s390x_features.c 2012-05-29 12:02:28 +01:00 (rev 12593)
@@ -17,9 +17,9 @@
// model, if specified, matches the machine
// - 1 the machine does not provide the asked-for feature or the
// cpu model, if specified, does not match the machine
+// - 1 for an unknown cpu model in /proc/cpu_info
// - 2 if the asked-for feature isn't recognised (this will be the case for
// any feature if run on a non-s390x machine).
-// - 2 for an unknown cpu model in /proc/cpu_info
// - 3 if there was a usage error (it also prints an error message).
//
// USAGE:
@@ -84,6 +84,7 @@
{ "2097", "z10-ec" },
{ "2098", "z10-bc" },
{ "2817", "z196" },
+ { "2818", "z114" },
};
@@ -224,7 +225,7 @@
if (cpu == NULL) return 0;
host = get_host();
- if (host == NULL) return 2; // unknown model
+ if (host == NULL) return 1; // unknown model
// printf("host = %s (%s)\n", host->cpuinfo_name, host->real_name);
|