diff options
| author | Philip Chimento <philip.chimento@gmail.com> | 2014-03-15 23:48:52 -0700 |
|---|---|---|
| committer | Colin Walters <walters@verbum.org> | 2014-10-01 08:10:30 -0400 |
| commit | 1d8d206f48145623cd79a6d6d00bfeb12f73c0da (patch) | |
| tree | e98a52657f059021240aea5074b62463bb3ff9a8 | |
| parent | fe050239852eb0754b8ac603d8cd9eb06c60c867 (diff) | |
| download | gobject-introspection-1d8d206f48145623cd79a6d6d00bfeb12f73c0da.tar.gz | |
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
| -rw-r--r-- | tests/scanner/Regress-1.0-C-expected/Regress.IntsetAlias.page (renamed from tests/scanner/Regress-1.0-C-expected/Regress.IntSet.page) | 4 | ||||
| -rw-r--r-- | tests/scanner/Regress-1.0-expected.gir | 2 | ||||
| -rw-r--r-- | tests/scanner/regress.h | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.IntSet.page b/tests/scanner/Regress-1.0-C-expected/Regress.IntsetAlias.page index b8324f86..3203bc01 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.IntSet.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.IntsetAlias.page @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<page id="Regress.IntSet" +<page id="Regress.IntsetAlias" type="topic" style="default" xmlns="http://projectmallard.org/1.0/" @@ -8,7 +8,7 @@ <info> <link xref="index" group="default" type="guide"/> </info> - <title>Regress.IntSet</title> + <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: |