[vala/staging] tests/girwriter: Expect generated files with unversioned header

[Rico Tzschichholz <ricotz src gnome org>]

commit 714c4293cf505d9b272cb992cc02f5e0c8f36af0
Author: Rico Tzschichholz <ricotz ubuntu com>
Date:   Wed Apr 28 21:33:10 2021 +0200

    tests/girwriter: Expect generated files with unversioned header

 tests/girwriter/GirTest-1.0.gir-expected | 2 ++
 tests/girwriter/Makefile.am              | 6 +++---
 tests/girwriter/girtest.vapi-expected    | 2 ++
 tests/girwriter/girtest.vapigen-expected | 2 ++
 4 files changed, 9 insertions(+), 3 deletions(-)
---
diff --git a/tests/girwriter/GirTest-1.0.gir-expected b/tests/girwriter/GirTest-1.0.gir-expected
index d4bb4291e..013340e13 100644
--- a/tests/girwriter/GirTest-1.0.gir-expected
+++ b/tests/girwriter/GirTest-1.0.gir-expected
@@ -1,3 +1,5 @@
+<?xml version="1.0"?>
+<!-- GirTest-1.0.gir generated by valac, do not modify. -->
 <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="GObject" version="2.0"/>
 <include name="GLib" version="2.0"/>
diff --git a/tests/girwriter/Makefile.am b/tests/girwriter/Makefile.am
index f1554d0e7..a1bafd712 100644
--- a/tests/girwriter/Makefile.am
+++ b/tests/girwriter/Makefile.am
@@ -10,8 +10,8 @@ check-girwriter: $(top_builddir)/compiler/valac
                --library girtest \
                --shared-library girtest \
                $(srcdir)/girtest.vala; \
-       tail -n +3 girtest.vapi | diff -wu $(srcdir)/girtest.vapi-expected - || exit 1; \
-       tail -n +3 GirTest-1.0.gir | diff -wu $(srcdir)/GirTest-1.0.gir-expected - || exit 1;
+       diff -wu $(srcdir)/girtest.vapi-expected $(builddir)/girtest.vapi || exit 1; \
+       diff -wu $(srcdir)/GirTest-1.0.gir-expected $(builddir)/GirTest-1.0.gir || exit 1;
 if HAVE_G_IR_COMPILER
        $(G_IR_COMPILER) -o GirTest-1.0.typelib GirTest-1.0.gir;
 endif
@@ -22,7 +22,7 @@ endif
                --library girtest \
                --metadatadir $(srcdir) \
                GirTest-1.0.gir; \
-       tail -n +3 girtest.vapi | diff -wu $(srcdir)/girtest.vapigen-expected - || exit 1;
+       diff -wu $(srcdir)/girtest.vapigen-expected $(builddir)/girtest.vapi || exit 1;
        rm -f GirTest-1.0.gir GirTest-1.0.typelib girtest.vapi;
 
 check: check-girwriter
diff --git a/tests/girwriter/girtest.vapi-expected b/tests/girwriter/girtest.vapi-expected
index 7ed0bfe51..2a7664f11 100644
--- a/tests/girwriter/girtest.vapi-expected
+++ b/tests/girwriter/girtest.vapi-expected
@@ -1,3 +1,5 @@
+/* girtest.vapi generated by valac, do not modify. */
+
 [CCode (gir_namespace = "GirTest", gir_version = "1.0")]
 namespace GirTest {
        namespace Nested {
diff --git a/tests/girwriter/girtest.vapigen-expected b/tests/girwriter/girtest.vapigen-expected
index a4de2304d..494e98d07 100644
--- a/tests/girwriter/girtest.vapigen-expected
+++ b/tests/girwriter/girtest.vapigen-expected
@@ -1,3 +1,5 @@
+/* girtest.vapi generated by vapigen, do not modify. */
+
 [CCode (cprefix = "GirTest", gir_namespace = "GirTest", gir_version = "1.0", lower_case_cprefix = 
"gir_test_")]
 namespace GirTest {
        namespace Nested {