Olivier Goffart
95edd6a9de
Merge remote-tracking branch 'origin/master' into dav
...
Conflicts:
config/ocsync_log.conf
src/csync.c
src/csync.h
src/csync_config.c
src/csync_log.h
src/csync_private.h
src/csync_statedb.c
tests/csync_tests/check_csync_config.c
2012-12-03 17:32:08 +01:00
Klaas Freitag
f90550775c
Fixed tests to also run on debian host
2012-11-23 12:51:01 +01:00
Klaas Freitag
3fcc56ebbc
Add removal of a test dir
2012-11-23 11:43:39 +01:00
Klaas Freitag
1147e77d67
Fix delete in csync_config
2012-11-23 11:26:24 +01:00
Klaas Freitag
d5a32543ef
Fix update test.
2012-11-09 17:24:17 +01:00
Klaas Freitag
7aeeeae037
Fix test, avoid double free.
2012-11-09 17:16:27 +01:00
Andreas Schneider
2752a9e9c0
tests: Remove the right directory in the teardown function.
2012-10-30 14:49:18 +01:00
Andreas Schneider
e3e00b4b32
tests: Add a csync_log test.
2012-10-30 11:39:51 +01:00
Andreas Schneider
dd60412a50
doc: Remove all references to log4c.
2012-10-30 11:27:21 +01:00
Andreas Schneider
8a0b4319d3
csync: Add a new logging system.
2012-10-30 11:27:21 +01:00
Andreas Schneider
890df87d00
csync: Add support for a log callback.
2012-10-30 11:27:20 +01: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
Klaas Freitag
0cea891a98
Fix name of config file in log test case.
2012-10-26 11:53:29 +02:00
Andreas Schneider
e43466d09d
tests: Add exclude test for journal db names.
2012-10-22 15:13:52 +02:00
Klaas Freitag
01a25db3fb
exclude: Fix checking the exclude pattern for subdirs.
...
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
2012-10-22 12:26:35 +02:00
Andreas Schneider
c24a18cbfd
cmake: Cleanup testing and enable test target.
2012-10-19 19:07:15 +02:00
Andreas Schneider
ac5855940a
tests: Remove the check_vio_local test.
...
It is tested by check_vio anyway.
2012-10-19 18:26:19 +02:00
Andreas Schneider
fafa632b65
tests: Migrate check_vio_handle to cmocka.
2012-10-19 18:21:37 +02:00
Andreas Schneider
7aa63e23aa
tests: Migrate check_vio_file_stat to cmocka.
2012-10-19 18:16:36 +02:00
Andreas Schneider
8d737287fb
tests: Migrate check_vio to cmocka.
2012-10-19 18:14:28 +02:00
Andreas Schneider
ecd944a162
tests: Migrate check_csync_update to cmocka.
2012-10-19 17:25:41 +02:00
Andreas Schneider
7c59ea2999
tests: Migrate check_csync_util to cmocka.
2012-10-19 16:10:30 +02:00
Andreas Schneider
b58bcb510d
tests: Migrate check_csync_time to cmocka.
2012-10-19 16:06:47 +02:00
Andreas Schneider
792be0f053
tests: Migrate check_csync_statedb_query to cmocka.
2012-10-19 15:53:22 +02:00
Andreas Schneider
aa227aa10b
tests: Migrate check_csync_statedb_load to cmocka.
2012-10-19 14:43:25 +02:00
Andreas Schneider
3b7104f514
tests: Migrate check_csync_lock to cmocka.
2012-10-19 14:29:10 +02:00
Andreas Schneider
eded4915e9
tests: Migrate check_csync_init to cmocka.
2012-10-19 10:57:40 +02:00
Andreas Schneider
3a179c8822
tests: Migrate check_csync_exclude to cmocka.
2012-10-18 15:17:24 +02:00
Andreas Schneider
ab5f38a680
cmake: Add check for asprintf().
2012-10-18 15:07:17 +02:00
Andreas Schneider
13df0426af
tests: Migrate check_csync_create to cmocka.
2012-10-17 17:46:45 +02:00
Andreas Schneider
b4eee0383d
tests: Migrate check_csync_config to cmocka.
2012-10-17 17:03:22 +02:00
Andreas Schneider
6dcb50d8ba
tests: Disable log test.
2012-10-16 17:23:07 +02:00
Andreas Schneider
1582067200
tests: Migrate check_std_c_tim to cmocka.
2012-10-16 17:06:46 +02:00
Andreas Schneider
f4b1ce9350
tests: Migrate check_std_c_str to cmocka.
2012-10-16 17:01:25 +02:00
Andreas Schneider
3395ed2b95
tests: Migrate check_std_c_rbtree to cmocka.
2012-10-16 16:37:38 +02:00
Andreas Schneider
17e0da1e65
tests: Migrate check_std_c_path to cmocka.
2012-10-16 15:49:06 +02:00
Andreas Schneider
4db3194e84
tests: Migrate check_std_c_list to cmocka.
2012-10-16 15:32:33 +02:00
Andreas Schneider
4529928edc
tests: Migrate check_std_c_jhash to cmocka.
2012-10-16 14:54:59 +02:00
Andreas Schneider
7155528bb5
tests: Migrate check_std_c_file to cmocka.
2012-10-16 14:31:21 +02:00
Klaas Freitag
8633d7751a
Fix test script to work with ocsync.
2012-10-16 11:53:20 +02:00
Andreas Schneider
24f066ef0b
tests: Migrate check_std_c_dir to cmocka.
2012-10-16 11:04:13 +02:00
Andreas Schneider
b1b0c2c510
tests: Start to use cmocka for the tests.
2012-10-16 10:37:40 +02:00
Klaas Freitag
4bf72957bb
Added test for std function c_tmpname.
2012-10-01 17:24:02 +02:00
Klaas Freitag
b976ac914d
Also check the files basename against the exclude pattern.
2012-09-25 15:41:55 +03:00
Klaas Freitag
4eb1ae7853
Fix test: Status must be INSTRUCTION_EVAL.
...
This test runs on an empty database. That also means that there is no
ID in the database which is needed to detect the update. An empty
ID means that the status must be evaluated.
2012-09-24 16:47:43 +03:00
Klaas Freitag
407b87c17b
Fix statedb test: Added new columns.
2012-09-24 16:28:43 +03:00
Klaas Freitag
99691059bf
Removed all usage of openSSL.
2012-08-29 15:37:31 +03:00
Klaas Freitag
4e4fca54c2
added test data as well as a test config template.
2012-08-29 15:26:31 +03:00
Klaas Freitag
52e0f06692
use a more speaking name for config file.
2012-08-29 15:26:15 +03:00