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 |
|
Andreas Schneider
|
acf3dc6aff
|
config: Implement a new config parser.
|
2013-07-28 23:16:04 +02:00 |
|
Andreas Schneider
|
457086c63e
|
tests: Apply changes to the logging system.
|
2013-03-01 10:06:06 +01:00 |
|
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
|
1147e77d67
|
Fix delete in csync_config
|
2012-11-23 11:26:24 +01:00 |
|
Andreas Schneider
|
2752a9e9c0
|
tests: Remove the right directory in the teardown function.
|
2012-10-30 14:49:18 +01:00 |
|
Andreas Schneider
|
8a0b4319d3
|
csync: Add a new logging system.
|
2012-10-30 11:27:21 +01:00 |
|
Andreas Schneider
|
ab5f38a680
|
cmake: Add check for asprintf().
|
2012-10-18 15:07:17 +02:00 |
|
Andreas Schneider
|
b4eee0383d
|
tests: Migrate check_csync_config to cmocka.
|
2012-10-17 17:03:22 +02:00 |
|
Andreas Schneider
|
e2b049c935
|
Static functions should all start with an underscore.
For better readablity...
|
2008-06-02 15:11:45 +02:00 |
|
Andreas Schneider
|
9a440d4501
|
Respect return values in tests.
|
2008-05-08 17:28:12 +02:00 |
|
Andreas Schneider
|
e41e8e1610
|
Add commandline parsing to all tests.
|
2008-05-07 11:09:56 +02:00 |
|
Andreas Schneider
|
ad67b21062
|
Use always the same path for testing.
|
2008-05-05 10:55:05 +02:00 |
|
Andreas Schneider
|
e6b45181f3
|
Add the possibility to disable log4c in testcases.
|
2008-04-25 10:56:23 +02:00 |
|
Andreas Schneider
|
dc72b7397c
|
Add the local and remote uri at creation time.
|
2008-04-22 17:23:26 +02:00 |
|
Andreas Schneider
|
5257f277a4
|
Config test should run in fork mode.
|
2008-03-25 16:08:39 +01:00 |
|
Andreas Schneider
|
2e34b51373
|
Load the config file.
|
2008-03-06 17:43:58 +01:00 |
|