Fix compile errors

cmocka seems to #define fail to something inappropriate.

test/csync/csync_tests/check_csync_exclude.cpp

@@ -22,11 +22,11 @@
 #include <time.h>
 #include <sys/time.h>
 
-#include "torture.h"
-
 #define CSYNC_TEST 1
 #include "csync_exclude.cpp"
 
+#include "torture.h"
+
 #define EXCLUDE_LIST_FILE SOURCEDIR"/../../sync-exclude.lst"
 
 static int setup(void **state) {

test/csync/csync_tests/check_csync_log.cpp

@@ -20,13 +20,13 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#include "torture.h"
-
 #include "csync.h"
 #include "csync_log.cpp"
 #include "c_private.h"
 #include "std/c_utf8.h"
 
+#include "torture.h"
+
 static int setup(void **state) {
     int rc;
 

test/csync/csync_tests/check_csync_statedb_load.cpp

@@ -19,11 +19,11 @@
  */
 #include <string.h>
 
-#include "torture.h"
-
 #define CSYNC_TEST 1
 #include "csync_statedb.cpp"
 
+#include "torture.h"
+
 #define TESTDB "/tmp/check_csync1/test.db"
 
 static int setup(void **state) {

test/csync/csync_tests/check_csync_statedb_query.cpp

@@ -17,16 +17,16 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
-#include "torture.h"
 
 #define CSYNC_TEST 1
 #include "csync_statedb.cpp"
 
+#include "torture.h"
+
 #define TESTDB "/tmp/check_csync1/test.db"
 #define TESTDBTMP "/tmp/check_csync1/test.db.ctmp"
 
 
-
 static int setup(void **state)
 {
     CSYNC *csync;

test/csync/csync_tests/check_csync_update.cpp

@@ -17,10 +17,10 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
-#include "torture.h"
-
 #include "csync_update.cpp"
 
+#include "torture.h"
+
 #define TESTDB "/tmp/check_csync/journal.db"
 
 static int firstrun = 1;

test/csync/csync_tests/check_csync_util.cpp

@@ -17,10 +17,10 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
-#include "torture.h"
-
 #include "csync_util.h"
 
+#include "torture.h"
+
 static void check_csync_instruction_str(void **state)
 {
   const char *str;

test/csync/encoding_tests/check_encoding.cpp

@@ -17,7 +17,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
-#include "torture.h"
 #include <stdio.h>
 #include "c_string.h"
 #include "c_path.h"
@@ -27,6 +26,7 @@
 #include <string.h>
 #endif
 
+#include "torture.h"
 
 static void check_iconv_to_native_normalization(void **state)
 {

test/csync/std_tests/check_std_c_path.c

@@ -22,10 +22,10 @@
 #include <stdio.h>
 #include <time.h>
 
-#include "torture.h"
-
 #include "std/c_path.h"
 
+#include "torture.h"
+
 static void check_c_basename(void **state)
 {
     char *bname;

test/csync/std_tests/check_std_c_time.c

@@ -19,12 +19,12 @@
  */
 #include <string.h>
 
-#include "torture.h"
-
 #include "csync_time.h"
 #include "std/c_time.h"
 #include <unistd.h>
 
+#include "torture.h"
+
 static void check_c_tspecdiff(void **state)
 {
     struct timespec start, finish, diff;

test/csync/vio_tests/check_vio.cpp

@@ -23,12 +23,12 @@
 #include <string.h>
 #include <errno.h>
 
-#include "torture.h"
-
 #include "csync_private.h"
 #include "std/c_utf8.h"
 #include "vio/csync_vio.h"
 
+#include "torture.h"
+
 #define CSYNC_TEST_DIR "/tmp/csync_test/"
 #define CSYNC_TEST_DIRS "/tmp/csync_test/this/is/a/mkdirs/test"
 #define CSYNC_TEST_FILE "/tmp/csync_test/file.txt"

test/csync/vio_tests/check_vio_ext.cpp

@@ -24,8 +24,6 @@
 #include <errno.h>
 #include <stdio.h>
 
-#include "torture.h"
-
 #include "csync_private.h"
 #include "std/c_utf8.h"
 #include "vio/csync_vio.h"
@@ -39,6 +37,8 @@
 #endif
 #define MKDIR_MASK (S_IRWXU |S_IRGRP|S_IXGRP|S_IROTH|S_IXOTH)
 
+#include "torture.h"
+
 #define WD_BUFFER_SIZE 255
 
 static mbchar_t wd_buffer[WD_BUFFER_SIZE];