From abadfaacdc46e25bc6866966aa1b94e15e2713bc Mon Sep 17 00:00:00 2001 From: Christian Borntraeger Date: Tue, 29 May 2012 11:02:28 +0000 Subject: [PATCH] Fix machine detection on s390 to not bail out the regression test on unknown systems. git-svn-id: svn://svn.valgrind.org/valgrind/trunk@12593 --- tests/s390x_features.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/s390x_features.c b/tests/s390x_features.c index 302d167724..31a7bd7565 100644 --- a/tests/s390x_features.c +++ b/tests/s390x_features.c @@ -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 @@ model_info models[] = { { "2097", "z10-ec" }, { "2098", "z10-bc" }, { "2817", "z196" }, + { "2818", "z114" }, }; @@ -224,7 +225,7 @@ static int go(char *feature, char *cpu) 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); -- 2.47.2