nettika/geary
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add client lib to the test build.

Browse source 
* test/CMakeLists.txt: Add client lib and dependent packages to the
  build.

* test/main.vala (main): Add test suites  for both client and engine
  tests to allow some more fine-grained control when running them. Also
  add some sectioning doc comments.
This commit is contained in:
Michael James Gratton 2016-12-26 13:18:51 +10:30
parent bf42b7e0dd
commit 325232bad7
2 changed files with 36 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

15
test/CMakeLists.txt
View file

@ -24,10 +24,21 @@ pkg_check_modules(DEPS REQUIRED
glib-2.0
gmime-2.6
gthread-2.0
gtk+-3.0
libsoup-2.4
webkitgtk-3.0
)
set(TEST_PACKAGES
glib-2.0 gio-2.0 gee-0.8 gmime-2.6 geary-engine
geary-client
geary-engine
gee-0.8
gio-2.0
glib-2.0
gmime-2.6
gtk+-3.0
libsoup-2.4
webkitgtk-3.0
)
set(CFLAGS
@ -65,4 +76,4 @@ OPTIONS
)
add_executable(geary-test ${TEST_VALA_C})
target_link_libraries(geary-test ${DEPS_LIBRARIES} geary-engine)
target_link_libraries(geary-test ${DEPS_LIBRARIES} geary-client geary-engine)

30
test/main.vala
View file

@ -6,19 +6,35 @@
*/
int main(string[] args) {
/*
* Initialise all the things.
*/
Test.init(ref args);
Geary.RFC822.init();
Geary.HTML.init();
TestSuite root = TestSuite.get_root();
/*
* Hook up all tests into appropriate suites
*/
// Engine tests
root.add_suite(new Geary.HTML.UtilTest().get_suite());
root.add_suite(new Geary.RFC822.MailboxAddressTest().get_suite());
root.add_suite(new Geary.RFC822.MessageTest().get_suite());
root.add_suite(new Geary.RFC822.MessageDataTest().get_suite());
root.add_suite(new Geary.RFC822.Utils.Test().get_suite());
TestSuite engine = new TestSuite("engine");
engine.add_suite(new Geary.HTML.UtilTest().get_suite());
engine.add_suite(new Geary.RFC822.MailboxAddressTest().get_suite());
engine.add_suite(new Geary.RFC822.MessageTest().get_suite());
engine.add_suite(new Geary.RFC822.MessageDataTest().get_suite());
engine.add_suite(new Geary.RFC822.Utils.Test().get_suite());
TestSuite client = new TestSuite("client");
/*
* Run the tests
*/
TestSuite root = TestSuite.get_root();
root.add_suite(engine);
root.add_suite(client);
return Test.run();
}