diff options
| author | kamalpreetgrewal <grewalkamal005@gmail.com> | 2016-06-10 14:36:23 +0000 |
|---|---|---|
| committer | kamalpreetgrewal <grewalkamal005@gmail.com> | 2016-06-10 14:36:23 +0000 |
| commit | 69d70bf4bab135026b41751f69d352fb9d9b58e4 (patch) | |
| tree | 840f4967a8391b478d2767a32502e0970beb7271 | |
| parent | Add selector to style element (diff) | |
| parent | Remove unit test dependency on GUI session to allow auto-build in PPA (diff) | |
| download | inkscape-69d70bf4bab135026b41751f69d352fb9d9b58e4.tar.gz inkscape-69d70bf4bab135026b41751f69d352fb9d9b58e4.zip | |
Merge changes from trunk
(bzr r14949.1.6)
| -rw-r--r-- | testfiles/unittest.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/testfiles/unittest.cpp b/testfiles/unittest.cpp index 0ec8f0383..79e240e06 100644 --- a/testfiles/unittest.cpp +++ b/testfiles/unittest.cpp @@ -35,10 +35,13 @@ int main(int argc, char **argv) { #if !GLIB_CHECK_VERSION(2,36,0) g_type_init(); #endif - int tmpArgc = 1; - char const *tmp[] = {"foo", ""}; - char **tmpArgv = const_cast<char **>(tmp); - Gtk::Main(tmpArgc, tmpArgv); + + // If possible, unit tests shouldn't require a GUI session + // since this won't generally be available in auto-builders + // int tmpArgc = 1; + // char const *tmp[] = {"foo", ""}; + // char **tmpArgv = const_cast<char **>(tmp); + // Gtk::Main(tmpArgc, tmpArgv); Inkscape::GC::init(); |