tests: Update non-null warning messages to support LLVM 3.5

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.

3 files changed, 43 insertions, 43 deletions

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);
  *                                          ~~~~          ^
  */