lp:~jeremywootten/pantheon-files/enable-testing-ctest-part4

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~elementary-apps/pantheon-files/trunk at revision 2492

elementary Apps team: Pending requested 2017-01-10

Diff: 883 lines (+399/-341)

14 files modified

libcore/gof-directory-async.vala (+3/-0)
libcore/gof-file.c (+13/-3)
libcore/pantheon-files-core-C.vapi (+2/-0)
libcore/tests/GOFDirectoryAsyncTests/CMakeLists.txt (+17/-2)
libcore/tests/GOFDirectoryAsyncTests/GOFDirectoryAsyncTests.vala (+159/-0)
libcore/tests/GOFDirectoryAsyncTests/marlincore-tests-file.c (+0/-100)
libcore/tests/GOFDirectoryAsyncTests/marlincore-tests-file.h (+0/-27)
libcore/tests/GOFDirectoryAsyncTests/tests.c (+0/-33)
libcore/tests/GOFFileTests/CMakeLists.txt (+16/-2)
libcore/tests/GOFFileTests/GOFFileTests.vala (+174/-0)
libcore/tests/GOFFileTests/marlincore-tests-gof.c (+0/-99)
libcore/tests/GOFFileTests/marlincore-tests-gof.h (+0/-27)
libcore/tests/GOFFileTests/tests.c (+0/-33)
libcore/tests/UtilTests/CMakeLists.txt (+15/-15)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

2449. By Jeremy Wootten on 2017-02-12

Merge trunk to r2490

2448. By Jeremy Wootten on 2017-02-08

Merge parent

2447. By Jeremy Wootten on 2017-02-07

Merge changes from parent and trunk

2446. By Jeremy Wootten on 2017-02-04

Ensure build from scratch

2445. By Jeremy Wootten on 2017-02-04

Merge trunk to r2470

2444. By Jeremy Wootten on 2017-02-04

Merge change from parent (Add default theme method)

2443. By Jeremy Wootten on 2017-02-04

Merge updates from parent and resolve conflict

2442. By Jeremy Wootten on 2017-01-08

Remove unwanted files

2441. By Jeremy Wootten on 2017-01-07

Convert basic GOF File tests to Vala, guard against possible GOF File bug revealed

2440. By Jeremy Wootten on 2017-01-07

Convert GOF.Directory.Async tests to Vala, clean up