[gnome-desktop-testing] Rename launcher to avoid recursion

[Colin Walters <walters src gnome org>]

commit 20eb7cde4a911c98a812e631368d28881de001b3
Author: Colin Walters <walters verbum org>
Date:   Thu Apr 25 06:49:38 2013 -0400

    Rename launcher to avoid recursion
    
    Oops...

 Makefile-tests.am                                  |   10 +++++-----
 ...top => gnome-ostree-integration-runner.desktop} |    2 +-
 ...tests.in => gnome-ostree-integration-runner.in} |    2 +-
 ...tests.js => gnome-ostree-integration-runner.js} |    2 ++
 4 files changed, 9 insertions(+), 7 deletions(-)
---
diff --git a/Makefile-tests.am b/Makefile-tests.am
index 8289474..bb3f966 100644
--- a/Makefile-tests.am
+++ b/Makefile-tests.am
@@ -22,15 +22,15 @@ substitutions= \
        -e s,@pkgdatadir\@,$(pkgdatadir), \
        $(NULL)
 
-BUILT_SOURCES += gnome-ostree-run-installed-tests
+BUILT_SOURCES += gnome-ostree-integration-runner
 
-gnome-ostree-run-installed-tests: src/gnome-ostree-run-installed-tests.in Makefile
+gnome-ostree-integration-runner: src/gnome-ostree-integration-runner.in Makefile
        sed $(substitutions) $< > $  tmp && mv $  tmp $@
 
-bin_PROGRAMS += gnome-ostree-run-installed-tests
+bin_PROGRAMS += gnome-ostree-integration-runner
 
 pkgjsdir = $(pkgdatadir)/js
-pkgjs_DATA = src/gnome-ostree-run-installed-tests.js
+pkgjs_DATA = src/gnome-ostree-integration-runner.js
 
 etcxdgautostartdir = $(sysconfdir)/xdg/autostart
-etcxdgautostart_DATA = src/gnome-ostree-run-installed-tests.desktop
+etcxdgautostart_DATA = src/gnome-ostree-integration-runner.desktop
diff --git a/src/gnome-ostree-run-installed-tests.desktop b/src/gnome-ostree-integration-runner.desktop
similarity index 71%
rename from src/gnome-ostree-run-installed-tests.desktop
rename to src/gnome-ostree-integration-runner.desktop
index 0dee8cd..ce41ac4 100644
--- a/src/gnome-ostree-run-installed-tests.desktop
+++ b/src/gnome-ostree-integration-runner.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Encoding=UTF-8
 Name=GNOME-OSTree installed tests
-Exec=gnome-ostree-run-installed-tests
+Exec=gnome-ostree-integration-runner
 Terminal=false
 Type=Application
diff --git a/src/gnome-ostree-run-installed-tests.in b/src/gnome-ostree-integration-runner.in
similarity index 93%
rename from src/gnome-ostree-run-installed-tests.in
rename to src/gnome-ostree-integration-runner.in
index c996f26..7c73737 100644
--- a/src/gnome-ostree-run-installed-tests.in
+++ b/src/gnome-ostree-integration-runner.in
@@ -23,4 +23,4 @@ export LD_LIBRARY_PATH="@pkglibdir@/${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
 export PKGDATADIR= pkgdatadir@
 export PKGLIBDIR= pkglibdir@
 
-exec gjs -I "${jsdir}" "${jsdir}/gnome-ostree-run-installed-tests.js" "$@"
+exec gjs -I "${jsdir}" "${jsdir}/gnome-ostree-integration-runner.js" "$@"
diff --git a/src/gnome-ostree-run-installed-tests.js b/src/gnome-ostree-integration-runner.js
similarity index 97%
rename from src/gnome-ostree-run-installed-tests.js
rename to src/gnome-ostree-integration-runner.js
index 0f171e3..313f505 100755
--- a/src/gnome-ostree-run-installed-tests.js
+++ b/src/gnome-ostree-integration-runner.js
@@ -38,6 +38,8 @@ while ((info = e.next_file(cancellable)) != null) {
     let i = name.lastIndexOf(INSTALLED_TEST_SUFFIX);
     if (i == -1 || i != name.length - INSTALLED_TEST_SUFFIX.length)
        continue;
+    if (name == 'gnome-ostree-run-installed-tests')
+       continue;
     let child = e.get_child(info);
     ntests += 1;
     print("Running test: " + child.get_path());