From 0743df4033967c18a5009e4f01ccf709f7c06c86 Mon Sep 17 00:00:00 2001 From: Philip Withnall Date: Mon, 3 Nov 2014 17:31:06 +0000 Subject: tests: Update non-null warning messages to support LLVM 3.5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The wording of the non-null warning messages changed between LLVM 3.4 and LLVM 3.5, so the tests were all arbitrarily failing. This change makes them work on LLVM 3.5 at the expense of failing on LLVM 3.4. There’s no satisfactory way to improve this, short of duplicating the test files and having one copy for 3.4 and one for 3.5. --- tests/assertion-extraction-return.c | 44 ++++++++++++++++++------------------- tests/assertion-extraction.c | 40 ++++++++++++++++----------------- tests/nonnull.c | 2 +- 3 files changed, 43 insertions(+), 43 deletions(-) (limited to 'tests') diff --git a/tests/assertion-extraction-return.c b/tests/assertion-extraction-return.c index a700706..276e062 100644 --- a/tests/assertion-extraction-return.c +++ b/tests/assertion-extraction-return.c @@ -8,10 +8,10 @@ } /* - * warning: null passed to a callee which requires a non-null argument + * null passed to a callee that requires a non-null argument * assertion_val_func (NULL, 1, obj); * ~~~~ ^ - * null passed to a callee which requires a non-null argument + * null passed to a callee that requires a non-null argument * assertion_val_func (NULL, 3, NULL); * ~~~~ ^ */ @@ -20,10 +20,10 @@ } /* - * null passed to a callee which requires a non-null argument + * null passed to a callee that requires a non-null argument * assertion_val_func ("str", 2, NULL); * ~~~~^ - * null passed to a callee which requires a non-null argument + * null passed to a callee that requires a non-null argument * assertion_val_func (NULL, 3, NULL); * ~~~~^ */ @@ -32,16 +32,16 @@ } /* - * null passed to a callee which requires a non-null argument + * null passed to a callee that requires a non-null argument * assertion_val_func (NULL, 1, obj); * ~~~~ ^ - * null passed to a callee which requires a non-null argument + * null passed to a callee that requires a non-null argument * assertion_val_func ("str", 2, NULL); * ~~~~^ - * null passed to a callee which requires a non-null argument + * null passed to a callee that requires a non-null argument * assertion_val_func (NULL, 3, NULL); * ~~~~^ - * null passed to a callee which requires a non-null argument + * null passed to a callee that requires a non-null argument * assertion_val_func (NULL, 3, NULL); * ~~~~ ^ */ @@ -51,10 +51,10 @@ } /* - * null passed to a callee which requires a non-null argument + * null passed to a callee that requires a non-null argument * assertion_val_func ("str", 2, NULL); * ~~~~^ - * null passed to a callee which requires a non-null argument + * null passed to a callee that requires a non-null argument * assertion_val_func (NULL, 3, NULL); * ~~~~^ */ @@ -65,10 +65,10 @@ } /* - * null passed to a callee which requires a non-null argument + * null passed to a callee that requires a non-null argument * assertion_val_func ("str", 2, NULL); * ~~~~^ - * null passed to a callee which requires a non-null argument + * null passed to a callee that requires a non-null argument * assertion_val_func (NULL, 3, NULL); * ~~~~^ */ @@ -78,10 +78,10 @@ } /* - * null passed to a callee which requires a non-null argument + * null passed to a callee that requires a non-null argument * assertion_val_func (NULL, 1, obj); * ~~~~ ^ - * null passed to a callee which requires a non-null argument + * null passed to a callee that requires a non-null argument * assertion_val_func (NULL, 3, NULL); * ~~~~ ^ */ @@ -91,10 +91,10 @@ } /* - * null passed to a callee which requires a non-null argument + * null passed to a callee that requires a non-null argument * assertion_val_func (NULL, 1, obj); * ~~~~ ^ - * null passed to a callee which requires a non-null argument + * null passed to a callee that requires a non-null argument * assertion_val_func (NULL, 3, NULL); * ~~~~ ^ */ @@ -104,16 +104,16 @@ } /* - * null passed to a callee which requires a non-null argument + * null passed to a callee that requires a non-null argument * assertion_val_func (NULL, 1, obj); * ~~~~ ^ - * null passed to a callee which requires a non-null argument + * null passed to a callee that requires a non-null argument * assertion_val_func ("str", 2, NULL); * ~~~~^ - * null passed to a callee which requires a non-null argument + * null passed to a callee that requires a non-null argument * assertion_val_func (NULL, 3, NULL); * ~~~~^ - * null passed to a callee which requires a non-null argument + * null passed to a callee that requires a non-null argument * assertion_val_func (NULL, 3, NULL); * ~~~~ ^ */ @@ -131,10 +131,10 @@ } /* - * null passed to a callee which requires a non-null argument + * null passed to a callee that requires a non-null argument * assertion_val_func (NULL, 1, obj); * ~~~~ ^ - * null passed to a callee which requires a non-null argument + * null passed to a callee that requires a non-null argument * assertion_val_func (NULL, 3, NULL); * ~~~~ ^ */ diff --git a/tests/assertion-extraction.c b/tests/assertion-extraction.c index 4d93465..a236980 100644 --- a/tests/assertion-extraction.c +++ b/tests/assertion-extraction.c @@ -8,10 +8,10 @@ } /* - * warning: null passed to a callee which requires a non-null argument + * null passed to a callee that requires a non-null argument * assertion_func (NULL, 1, obj); * ~~~~ ^ - * null passed to a callee which requires a non-null argument + * null passed to a callee that requires a non-null argument * assertion_func (NULL, 3, NULL); * ~~~~ ^ */ @@ -20,10 +20,10 @@ } /* - * null passed to a callee which requires a non-null argument + * null passed to a callee that requires a non-null argument * assertion_func ("str", 2, NULL); * ~~~~^ - * null passed to a callee which requires a non-null argument + * null passed to a callee that requires a non-null argument * assertion_func (NULL, 3, NULL); * ~~~~^ */ @@ -32,16 +32,16 @@ } /* - * null passed to a callee which requires a non-null argument + * null passed to a callee that requires a non-null argument * assertion_func (NULL, 1, obj); * ~~~~ ^ - * null passed to a callee which requires a non-null argument + * null passed to a callee that requires a non-null argument * assertion_func ("str", 2, NULL); * ~~~~^ - * null passed to a callee which requires a non-null argument + * null passed to a callee that requires a non-null argument * assertion_func (NULL, 3, NULL); * ~~~~^ - * null passed to a callee which requires a non-null argument + * null passed to a callee that requires a non-null argument * assertion_func (NULL, 3, NULL); * ~~~~ ^ */ @@ -51,10 +51,10 @@ } /* - * null passed to a callee which requires a non-null argument + * null passed to a callee that requires a non-null argument * assertion_func ("str", 2, NULL); * ~~~~^ - * null passed to a callee which requires a non-null argument + * null passed to a callee that requires a non-null argument * assertion_func (NULL, 3, NULL); * ~~~~^ */ @@ -65,10 +65,10 @@ } /* - * null passed to a callee which requires a non-null argument + * null passed to a callee that requires a non-null argument * assertion_func ("str", 2, NULL); * ~~~~^ - * null passed to a callee which requires a non-null argument + * null passed to a callee that requires a non-null argument * assertion_func (NULL, 3, NULL); * ~~~~^ */ @@ -78,10 +78,10 @@ } /* - * null passed to a callee which requires a non-null argument + * null passed to a callee that requires a non-null argument * assertion_func (NULL, 1, obj); * ~~~~ ^ - * null passed to a callee which requires a non-null argument + * null passed to a callee that requires a non-null argument * assertion_func (NULL, 3, NULL); * ~~~~ ^ */ @@ -91,10 +91,10 @@ } /* - * null passed to a callee which requires a non-null argument + * null passed to a callee that requires a non-null argument * assertion_func (NULL, 1, obj); * ~~~~ ^ - * null passed to a callee which requires a non-null argument + * null passed to a callee that requires a non-null argument * assertion_func (NULL, 3, NULL); * ~~~~ ^ */ @@ -104,16 +104,16 @@ } /* - * null passed to a callee which requires a non-null argument + * null passed to a callee that requires a non-null argument * assertion_func (NULL, 1, obj); * ~~~~ ^ - * null passed to a callee which requires a non-null argument + * null passed to a callee that requires a non-null argument * assertion_func ("str", 2, NULL); * ~~~~^ - * null passed to a callee which requires a non-null argument + * null passed to a callee that requires a non-null argument * assertion_func (NULL, 3, NULL); * ~~~~^ - * null passed to a callee which requires a non-null argument + * null passed to a callee that requires a non-null argument * assertion_func (NULL, 3, NULL); * ~~~~ ^ */ diff --git a/tests/nonnull.c b/tests/nonnull.c index 1fcf626..fb8efdd 100644 --- a/tests/nonnull.c +++ b/tests/nonnull.c @@ -24,7 +24,7 @@ } /* - * null passed to a callee which requires a non-null argument + * null passed to a callee that requires a non-null argument * guint64 size = g_ascii_strtoull (NULL, NULL, 10); * ~~~~ ^ */ -- cgit v1.2.3