summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChase Douglas <chase.douglas@ubuntu.com>2011-12-05 10:49:52 -0800
committerChase Douglas <chase.douglas@ubuntu.com>2011-12-05 10:49:52 -0800
commitf4706dc1c47eb59bda619dc105a0e6e9f0a81a21 (patch)
tree97c89bc69b333ace8566d1e42387c639ee97aa71
parent26cdf7ae0eb8477b2c8afa97d3857d8810de3d99 (diff)
Init gtest before checking for special args so --help works properly
Otherwise, it's impossible to list the gtest help list.
-rw-r--r--src/main.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main.cpp b/src/main.cpp
index 963d801..c3bdcbc 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -49,6 +49,8 @@ int main(int argc, char *argv[]) {
/* Default X display */
int xorg_display = 133;
+ testing::InitGoogleTest(&argc, argv);
+
/* Reset getopt state */
optind = 0;
@@ -77,8 +79,6 @@ int main(int argc, char *argv[]) {
exit(-1);
}
- testing::InitGoogleTest(&argc, argv);
-
if (!no_dummy_server) {
testing::xorg::Environment* environment = new testing::xorg::Environment(
xorg_conf_path,