warren/libiscsi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Port to CUnit version 2

Browse Source 
Linux distributions like openSUSE 12.3 include CUnit version 2.
Apparently libiscsi uses some CUnit version 1 data structures that
have been modified in CUnit version 2. This causes the libiscsi
build to fail against CUnit version 2. Fix this by detecting the
CUnit version during the configure step.

Signed-off-by: Bart Van Assche <bvanassche@acm.org>
This commit is contained in:
Bart Van Assche
2013-09-28 21:04:51 +02:00
committed by Ronnie Sahlberg
parent 766d92221c
commit bd948c959e
3 changed files with 197 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test-tool/iscsi-test-cu.h
+14 -4
View File
@@ -35,10 +35,20 @@ extern struct iscsi_context *iscsic2;
extern int tgt_lun2;
extern unsigned char *read_write_buf;
int test_setup(void);
int test_teardown(void);
int test_setup_pgr(void);
int test_teardown_pgr(void);
#ifdef HAVE_CU_SUITEINFO_PSETUPFUNC
/* libcunit version 2 */
#define CU_ST_RETTYPE void
#define CU_ST_RETURN(v) return
#else
/* libcunit version 1 */
#define CU_ST_RETTYPE int
#define CU_ST_RETURN(v) return v
#endif
CU_ST_RETTYPE test_setup(void);
CU_ST_RETTYPE test_teardown(void);
CU_ST_RETTYPE test_setup_pgr(void);
CU_ST_RETTYPE test_teardown_pgr(void);
void test_compareandwrite_simple(void);
void test_compareandwrite_miscompare(void);