tests: Fix up WarnLib build, remove accidental additions to regress.c

Previous WarnLib commit was broken.

3 files changed, 33 insertions, 15 deletions

diff --git a/tests/scanner/Makefile.am b/tests/scanner/Makefile.am
index 01c4ea53..ba2a58bf 100644
--- a/tests/scanner/Makefile.am
+++ b/tests/scanner/Makefile.am
@@ -81,7 +81,7 @@ WarnLib-1.0.gir: $(top_builddir)/Gio-2.0.gir libwarnlib.la
 WarnLib_1_0_gir_LIBS = libwarnlib.la
 WarnLib_1_0_gir_INCLUDES = Gio-2.0
 WarnLib_1_0_gir_FILES = $(libwarnlib_la_SOURCES)
-WarnLib_1_0_gir_SCANNERFLAGS = --c-include="warnlib.h"
+WarnLib_1_0_gir_SCANNERFLAGS = --c-include="warnlib.h" --symbol-prefix=warnlib_
 GIRS += WarnLib-1.0.gir
 
 Annotation-1.0.gir: Utility-1.0.gir libannotation.la
diff --git a/tests/scanner/WarnLib-1.0-expected.gir b/tests/scanner/WarnLib-1.0-expected.gir
new file mode 100644
index 00000000..9f3b348d
--- /dev/null
+++ b/tests/scanner/WarnLib-1.0-expected.gir
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<!-- This file was automatically generated from C sources - DO NOT EDIT!
+To affect the contents of this file, edit the original C definitions,
+and/or use gtk-doc annotations.  -->
+<repository version="1.2"
+            xmlns="http://www.gtk.org/introspection/core/1.0"
+            xmlns:c="http://www.gtk.org/introspection/c/1.0"
+            xmlns:glib="http://www.gtk.org/introspection/glib/1.0">
+  <include name="GLib" version="2.0"/>
+  <include name="GObject" version="2.0"/>
+  <include name="Gio" version="2.0"/>
+  <c:include name="warnlib.h"/>
+  <namespace name="WarnLib"
+             version="1.0"
+             shared-library=""
+             c:identifier-prefixes="WarnLib"
+             c:symbol-prefixes="warnlib_">
+    <function name="throw_unpaired"
+              c:identifier="warnlib_throw_unpaired"
+              throws="1">
+      <return-value transfer-ownership="none">
+        <type name="gboolean" c:type="gboolean"/>
+      </return-value>
+    </function>
+    <function name="unpaired_error_quark"
+              c:identifier="warnlib_unpaired_error_quark">
+      <return-value transfer-ownership="none">
+        <type name="GLib.Quark" c:type="GQuark"/>
+      </return-value>
+    </function>
+  </namespace>
+</repository>
diff --git a/tests/scanner/regress.c b/tests/scanner/regress.c
index 27791d7e..b7526bfb 100644
--- a/tests/scanner/regress.c
+++ b/tests/scanner/regress.c
@@ -1656,20 +1656,6 @@ regress_atest_error_quark (void)
   return g_quark_from_static_string ("regress-atest-error");
 }
 
-GQuark
-regress_unpaired_error_quark (void)
-{
-  return g_quark_from_static_string ("regress-unpaired-error");
-}
-
-gboolean
-regress_throw_unpaired (GError **error)
-{
-  g_set_error_literal (error, regress_unpaired_error_quark (), 0,
-                       "Unpaired error");
-  return FALSE;
-}
-
 /* structures */
 
 /**