From 725afd8b559c0726433bdf69361618966e769170 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20P=C3=A9gouri=C3=A9-Gonnard?= Date: Sat, 1 Feb 2014 11:54:28 +0100 Subject: [PATCH] Fix the 'error' test suite --- tests/suites/main_test.function | 4 +++- tests/suites/test_suite_error.data | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/tests/suites/main_test.function b/tests/suites/main_test.function index dc80135e7..1c508098c 100644 --- a/tests/suites/main_test.function +++ b/tests/suites/main_test.function @@ -61,7 +61,9 @@ int verify_int( char *str, int *value ) continue; } - if( str[i] < '0' || str[i] > '9' ) + if( ! ( ( str[i] >= '0' && str[i] <= '9' ) || + ( hex && ( ( str[i] >= 'a' && str[i] <= 'f' ) || + ( str[i] >= 'A' && str[i] <= 'F' ) ) ) ) ) { digits = 0; break; diff --git a/tests/suites/test_suite_error.data b/tests/suites/test_suite_error.data index 1a9997eb9..2caa3588d 100644 --- a/tests/suites/test_suite_error.data +++ b/tests/suites/test_suite_error.data @@ -14,8 +14,8 @@ Non existing high error error_strerror:-0x8880:"UNKNOWN ERROR CODE (8880)" Non existing low error -error_strerror:-0x0001:"UNKNOWN ERROR CODE (0001)" +error_strerror:-0x007F:"UNKNOWN ERROR CODE (007F)" Non existing low and high error -error_strerror:-0x8881:"UNKNOWN ERROR CODE (8880) \: UNKNOWN ERROR CODE (0001)" +error_strerror:-0x88FF:"UNKNOWN ERROR CODE (8880) \: UNKNOWN ERROR CODE (007F)"