summaryrefslogtreecommitdiff
path: root/daemon
diff options
context:
space:
mode:
authorStef Walter <stef@memberwebs.com>2010-06-08 15:45:33 +0000
committerStef Walter <stef@memberwebs.com>2010-06-08 15:59:24 +0000
commitddcd1ae794f789379964b6b26683c1436c19c70f (patch)
tree9dde333c533f1ba00737ce9555be36411458e7f0 /daemon
parentc16b8c01ad9fd6a564e06935781e385e84547be2 (diff)
downloadgnome-keyring-ddcd1ae794f789379964b6b26683c1436c19c70f.tar.gz
Cleanup naming and whitespace for testing stuff.
* Rip off bandaid (painful) whitespace cleanup. * At the same time cleanup naming, and remove old cruft.
Diffstat (limited to 'daemon')
-rw-r--r--daemon/.gitignore1
-rw-r--r--daemon/control/tests/test-control-change.c4
-rw-r--r--daemon/control/tests/test-control-init.c4
-rw-r--r--daemon/control/tests/test-control-unlock.c4
4 files changed, 6 insertions, 7 deletions
diff --git a/daemon/.gitignore b/daemon/.gitignore
index 3f574c69..5885fecb 100644
--- a/daemon/.gitignore
+++ b/daemon/.gitignore
@@ -14,7 +14,6 @@ Makefile.in
/gnome-keyring-ssh.desktop.in
*-marshal.[ch]
gnome-keyring-prompt
-run-auto-test*
/control/tests/test-control-change
/control/tests/test-control-init
diff --git a/daemon/control/tests/test-control-change.c b/daemon/control/tests/test-control-change.c
index ee5d9959..b910f777 100644
--- a/daemon/control/tests/test-control-change.c
+++ b/daemon/control/tests/test-control-change.c
@@ -1,6 +1,6 @@
#include "control/gkd-control.h"
-#include "tests/gtest-helpers.h"
+#include "testing/testing.h"
#include <pwd.h>
#include <unistd.h>
@@ -27,4 +27,4 @@ run (void)
return 0;
}
-#include "tests/gtest-helpers.c"
+#include "testing/testing.c"
diff --git a/daemon/control/tests/test-control-init.c b/daemon/control/tests/test-control-init.c
index c059477a..4b1d6b4e 100644
--- a/daemon/control/tests/test-control-init.c
+++ b/daemon/control/tests/test-control-init.c
@@ -1,6 +1,6 @@
#include "control/gkd-control.h"
-#include "tests/gtest-helpers.h"
+#include "testing/testing.h"
#include <pwd.h>
#include <stdlib.h>
@@ -27,4 +27,4 @@ run (void)
return 0;
}
-#include "tests/gtest-helpers.c"
+#include "testing/testing.c"
diff --git a/daemon/control/tests/test-control-unlock.c b/daemon/control/tests/test-control-unlock.c
index d77901b8..ba6cca4b 100644
--- a/daemon/control/tests/test-control-unlock.c
+++ b/daemon/control/tests/test-control-unlock.c
@@ -1,6 +1,6 @@
#include "control/gkd-control.h"
-#include "tests/gtest-helpers.h"
+#include "testing/testing.h"
#include <pwd.h>
#include <unistd.h>
@@ -21,4 +21,4 @@ run (void)
return 0;
}
-#include "tests/gtest-helpers.c"
+#include "testing/testing.c"