5 files changed, 8 insertions, 13 deletions
diff --git a/lib.c b/lib.c
index 83956623..b1b18aa7 100644
--- a/lib.c
+++ b/lib.c
@@ -150,7 +150,7 @@ void warning(struct position pos, const char * fmt, ...)
 {
 	va_list args;
 
-	if (Werror) {
+	if (Wsparse_error) {
 		va_start(args, fmt);
 		do_error(pos, fmt, args);
 		va_end(args);
@@ -226,7 +226,7 @@ int Wdesignated_init = 1;
 int Wdo_while = 0;
 int Winit_cstring = 0;
 int Wenum_mismatch = 1;
-int Werror = 0;
+int Wsparse_error = 0;
 int Wnon_pointer_null = 1;
 int Wold_initializer = 1;
 int Wone_bit_signed_bitfield = 1;
@@ -439,7 +439,7 @@ static const struct warning {
 	{ "designated-init", &Wdesignated_init },
 	{ "do-while", &Wdo_while },
 	{ "enum-mismatch", &Wenum_mismatch },
-	{ "error", &Werror },
+	{ "sparse-error", &Wsparse_error },
 	{ "init-cstring", &Winit_cstring },
 	{ "non-pointer-null", &Wnon_pointer_null },
 	{ "old-initializer", &Wold_initializer },
@@ -471,7 +471,7 @@ static char **handle_onoff_switch(char *arg, char **next, const struct warning w
 
 	if (!strcmp(p, "sparse-all")) {
 		for (i = 0; i < n; i++) {
-			if (*warnings[i].flag != WARNING_FORCE_OFF && warnings[i].flag != &Werror)
+			if (*warnings[i].flag != WARNING_FORCE_OFF && warnings[i].flag != &Wsparse_error)
 				*warnings[i].flag = WARNING_ON;
 		}
 	}
diff --git a/lib.h b/lib.h
index dc016840..15b69fa2 100644
--- a/lib.h
+++ b/lib.h
@@ -112,7 +112,7 @@ extern int Wdefault_bitfield_sign;
 extern int Wdesignated_init;
 extern int Wdo_while;
 extern int Wenum_mismatch;
-extern int Werror;
+extern int Wsparse_error;
 extern int Winit_cstring;
 extern int Wnon_pointer_null;
 extern int Wold_initializer;
diff --git a/sparse.1 b/sparse.1
index acdce531..63fceb91 100644
--- a/sparse.1
+++ b/sparse.1
@@ -24,7 +24,7 @@ off those warnings, pass the negation of the associated warning option,
 Turn on all sparse warnings, except for those explicitly disabled via
 \fB\-Wno\-something\fR.
 .TP
-.B \-Werror
+.B \-Wsparse\-error
 Turn all sparse warnings into errors.
 .TP
 .B \-Waddress\-space
diff --git a/sparse.c b/sparse.c
index 7d389b1e..6b3324cf 100644
--- a/sparse.c
+++ b/sparse.c
@@ -288,7 +288,7 @@ static void check_symbols(struct symbol_list *list)
 		}
 	} END_FOR_EACH_PTR(sym);
 
-	if (die_if_error)
+	if (Wsparse_error && die_if_error)
 		exit(1);
 }
 
diff --git a/validation/test-suite b/validation/test-suite
index 61667a56..744383dc 100755
--- a/validation/test-suite
+++ b/validation/test-suite
@@ -117,12 +117,7 @@ do_test()
 	if [ "$?" -eq "0" ]; then
 		expected_exit_value=`echo $last_result | tr -d ' '`
 	else
-		grep -q -E "^[^:]+:[[:digit:]]+:[[:digit:]]+: error:" "$file".error.expected
-		if  [ "$?" -eq "0" ]; then
-			expected_exit_value=1
-		else
-			expected_exit_value=0
-		fi
+		expected_exit_value=0
 	fi
 	verbose "Expecting exit value: $expected_exit_value"