From 1d8d206f48145623cd79a6d6d00bfeb12f73c0da Mon Sep 17 00:00:00 2001
From: Philip Chimento <philip.chimento@gmail.com>
Date: Sat, 15 Mar 2014 23:48:52 -0700
Subject: tests: Change names with case-only distinction

RegressIntSet and RegressIntset, aliases of one another, were causing
two documentation pages to be built by the documentation tests that
were named identically except for letter case.

On OSX and Windows, the most common filesystems are case-insensitive,
and those two files can't exist in the same directory on case-
insensitive filesystems. That caused the tests to fail. It also caused
problems when checking out the repository, because the expected
documentation set also contains those files.

This commit fixes the symptom (so that JHbuild will stop erroring out
on this module) but not the problem of generating a documentation set
for two identifiers which differ (perfectly legally) only by case.

https://bugzilla.gnome.org/show_bug.cgi?id=725264
---
 tests/scanner/Regress-1.0-C-expected/Regress.IntSet.page   | 14 --------------
 .../Regress-1.0-C-expected/Regress.IntsetAlias.page        | 14 ++++++++++++++
 tests/scanner/Regress-1.0-expected.gir                     |  2 +-
 tests/scanner/regress.h                                    |  4 ++--
 4 files changed, 17 insertions(+), 17 deletions(-)
 delete mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.IntSet.page
 create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.IntsetAlias.page

diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.IntSet.page b/tests/scanner/Regress-1.0-C-expected/Regress.IntSet.page
deleted file mode 100644
index b8324f86..00000000
--- a/tests/scanner/Regress-1.0-C-expected/Regress.IntSet.page
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<page id="Regress.IntSet"
-      type="topic"
-      style="default"
-      xmlns="http://projectmallard.org/1.0/"
-      xmlns:api="http://projectmallard.org/experimental/api/"
-      xmlns:ui="http://projectmallard.org/1.0/ui/">
-  <info>
-    <link xref="index" group="default" type="guide"/>
-  </info>
-  <title>Regress.IntSet</title>
-  <p>Compatibility typedef, like telepathy-glib's TpIntSet</p>
-
-</page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.IntsetAlias.page b/tests/scanner/Regress-1.0-C-expected/Regress.IntsetAlias.page
new file mode 100644
index 00000000..3203bc01
--- /dev/null
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.IntsetAlias.page
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page id="Regress.IntsetAlias"
+      type="topic"
+      style="default"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="index" group="default" type="guide"/>
+  </info>
+  <title>Regress.IntsetAlias</title>
+  <p>Compatibility typedef, like telepathy-glib's TpIntSet</p>
+
+</page>
diff --git a/tests/scanner/Regress-1.0-expected.gir b/tests/scanner/Regress-1.0-expected.gir
index 98f7ec97..1ad2198d 100644
--- a/tests/scanner/Regress-1.0-expected.gir
+++ b/tests/scanner/Regress-1.0-expected.gir
@@ -25,7 +25,7 @@ and/or use gtk-doc annotations.  -->
     <alias name="FooXEvent" c:type="RegressFooXEvent">
       <type name="gpointer" c:type="gpointer"/>
     </alias>
-    <alias name="IntSet" c:type="RegressIntSet" introspectable="0">
+    <alias name="IntsetAlias" c:type="RegressIntsetAlias" introspectable="0">
       <doc xml:space="preserve">Compatibility typedef, like telepathy-glib's TpIntSet</doc>
       <type name="Intset" c:type="RegressIntset"/>
     </alias>
diff --git a/tests/scanner/regress.h b/tests/scanner/regress.h
index 74a95b72..9bef3c86 100644
--- a/tests/scanner/regress.h
+++ b/tests/scanner/regress.h
@@ -1275,12 +1275,12 @@ void regress_random_function_with_skipped_structure (int x,
 typedef struct _RegressIntset RegressIntset;
 
 /**
- * RegressIntSet: (skip)
+ * RegressIntsetAlias: (skip)
  *
  * Compatibility typedef, like telepathy-glib's TpIntSet
  *
  */
-typedef RegressIntset RegressIntSet;
+typedef RegressIntset RegressIntsetAlias;
 
 /**
  * RegressPtrArrayAlias:
-- 
cgit v1.2.1