Commit graph

20 commits

Author SHA1 Message Date
Olivier Goffart
b4efcf1627 Compile the tests after merge
(Still not passing)
2013-08-18 19:11:36 +02:00
Olivier Goffart
b5ed352aa3 Merge remote-tracking branch 'origin/master' into ocsync
Only confluct resolution, do not compile or works

Conflicts:
	CMakeLists.txt
	CPackConfig.cmake
	ConfigureChecks.cmake
	client/csync_client.c
	cmake/Modules/DefineCompilerFlags.cmake
	cmake/Modules/DefineInstallationPaths.cmake
	cmake/Modules/FindIconv.cmake
	cmake/Modules/FindIniparser.cmake
	cmake/Modules/FindNeon.cmake
	config.h.cmake
	config/CMakeLists.txt
	config/ocsync.conf
	doc/CMakeLists.txt
	modules/csync_owncloud.c
	modules/csync_sftp2.c
	src/CMakeLists.txt
	src/csync.c
	src/csync.h
	src/csync_config.c
	src/csync_exclude.c
	src/csync_lock.c
	src/csync_macros.h
	src/csync_misc.c
	src/csync_misc.h
	src/csync_private.h
	src/csync_propagate.c
	src/csync_statedb.c
	src/csync_statedb.h
	src/csync_update.c
	src/csync_util.c
	src/csync_util.h
	src/std/c_dir.c
	src/std/c_file.c
	src/std/c_private.h
	src/std/c_string.c
	src/std/c_string.h
	src/std/c_time.c
	src/vio/csync_vio.c
	src/vio/csync_vio.h
	src/vio/csync_vio_file_stat.h
	src/vio/csync_vio_local.c
	src/vio/csync_vio_method.h
	tests/CMakeLists.txt
	tests/csync_tests/check_csync_statedb_load.c
	tests/csync_tests/check_csync_statedb_query.c
	tests/csync_tests/check_csync_treewalk.c
	tests/csync_tests/check_csync_update.c
	tests/ownCloud/HTTP/DAV.pm
	tests/ownCloud/ownCloud/Test.pm
	tests/std_tests/check_std_c_str.c
	tests/vio_tests/check_vio.c
2013-08-18 16:21:18 +02:00
Klaas Freitag
0191fa43e0 Fix tests after statedb_open had moved. 2013-08-07 12:43:32 +02:00
Daniel Molkentin
d9b34121ae Fix OS X build with -Werror 2013-07-31 14:50:44 +02:00
Andreas Schneider
1bae4f4dd4 Revert "CID 1033194: Fix resource leak in stateedb test."
This reverts commit c40a3844e0.

There is no leak and we expect it to be NULL. Since we fork here, it
doesn't matter if we leak memory in this case.
2013-07-13 08:57:56 +02:00
Klaas Freitag
5d731f7530 CID 1033193: Fix resource leaks in statedb test.
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
2013-07-12 12:05:38 +02:00
Klaas Freitag
c40a3844e0 CID 1033194: Fix resource leak in stateedb test.
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
2013-07-12 12:03:51 +02:00
Olivier Goffart
52c7ff415e Fix the test
After commit a25fbb6160, we re compute the
hash before insterint into the db.  Which means that the test need to
have different paths in order to succeed
2013-07-10 12:15:53 +02:00
Andreas Schneider
cd23f8d2d1 CID 1033195: Fix resource leak. 2013-07-04 11:57:31 +02:00
Andreas Schneider
bd6a66d51e tests: Fix a resource leak. 2013-07-04 11:55:55 +02:00
Andreas Schneider
8953ed544c statedb: Remove context where it isn't needed. 2013-07-04 10:29:48 +02:00
Andreas Schneider
d05b077851 statedb: Always pass down the db pointer. 2013-07-04 10:29:19 +02:00
Klaas Freitag
ae5847138c Fix test cases for the new database code. 2013-06-07 16:09:22 +02:00
Klaas Freitag
f2669ae886 Fix statedb-query test. 2013-05-22 16:43:31 +02:00
Klaas Freitag
2bb52ef6f9 Merge branch 'master' into dav - get cmocka tests and database move.
Conflicts:
	CMakeLists.txt
	cmake/Modules/FindCMocka.cmake
	src/csync.c
	src/csync_exclude.c
	src/csync_reconcile.c
	src/csync_statedb.c
	src/csync_update.c
	src/csync_util.c
	src/vio/csync_vio.c
	tests/CMakeLists.txt
	tests/csync_tests/check_csync_exclude.c
	tests/csync_tests/check_csync_statedb_load.c
	tests/csync_tests/check_csync_statedb_query.c
	tests/csync_tests/check_csync_update.c
	tests/std_tests/check_std_c_path.c
2012-10-27 19:27:14 +02:00
Klaas Freitag
9e4c873b16 Fixed csync testcases. 2012-10-26 21:33:13 +02:00
Andreas Schneider
792be0f053 tests: Migrate check_csync_statedb_query to cmocka. 2012-10-19 15:53:22 +02:00
Klaas Freitag
407b87c17b Fix statedb test: Added new columns. 2012-09-24 16:28:43 +03:00
Andreas Schneider
e5286c7c8a Rename journal functions to statedb. 2008-07-09 10:10:00 +02:00
Andreas Schneider
88690312d7 Rename the csync_journal files to csync_statedb. 2008-07-09 09:57:19 +02:00
Renamed from tests/csync_tests/check_csync_journal_query.c (Browse further)