use ted's suggestions for using xorg-gtest and to remove the service-test-runner.sh script

1 files changed, 1 insertions, 16 deletions

diff --git a/tests/test-service.cc b/tests/test-service.cc
index c3d2471..d163db5 100644
--- a/tests/test-service.cc
+++ b/tests/test-service.cc
@@ -25,8 +25,6 @@ with this program.  If not, see <http://www.gnu.org/licenses/>.
 ****
 ***/
 
-static const char * the_executable = NULL;
-
 /**
  * Fixture class for testing indicator-session-service with Google Test.
  */
@@ -36,7 +34,7 @@ class SessionServiceTest: public IndicatorServiceTest
     virtual ~SessionServiceTest() {}
     SessionServiceTest(): IndicatorServiceTest(INDICATOR_SESSION_DBUS_NAME,
                                                INDICATOR_SESSION_DBUS_OBJECT,
-                                               the_executable) { }
+                                               INDICATOR_SERVICE_PATH) { }
   public:
     virtual void SetUp() {
       wait_seconds(1);
@@ -56,16 +54,3 @@ TEST_F(SessionServiceTest, HelloWorld)
   ASSERT_TRUE(true);
 }
 
-
-int
-main (int argc, char *argv[])
-{
-  if (argc < 2) {
-    fprintf (stderr, "Usage: appname /path/to/indicator-session-service");
-    return -1;
-  }
-  the_executable = argv[1];
-  fprintf (stdout, "executable is '%s'\n", the_executable);
-  ::testing::InitGoogleTest(&argc, argv);
-  return RUN_ALL_TESTS();
-}