database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-01 17:39:21 +03:00
Code Activity

merge intel c++ changes from changeset 6813. addresses #1185

Browse Source 
git-svn-id: file:///svn/toku/tokudb.1195@7730 c7de825b-a66e-492c-adef-691d508d4ae1
This commit is contained in:
Rich Prohaska
2013-04-16 23:57:25 -04:00
committed by Yoni Fogel
parent ab0ac5ad70
commit a19234e8d1
7 changed files with 34 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
cxx/tests/exceptions.cpp
View File

@@ -13,7 +13,7 @@
int verbose = 0;
#define TC(expr, expect) ({ \
#define TC(expr, expect) \
if (verbose) printf("%s expect %d\n", #expr, expect); \
try { \
expr; \
@@ -21,10 +21,9 @@ int verbose = 0;
} catch (DbException e) { \
if (e.get_errno()!=expect) fprintf(stderr, "err=%d %s\n", e.get_errno(), db_strerror(e.get_errno())); \
assert(e.get_errno()==expect); \
} \
})
}
#define TCRET(expr, expect) ({ \
#define TCRET(expr, expect) \
if (verbose) printf("%s expect %d\n", #expr, expect); \
try { \
int r = expr; \
@@ -32,10 +31,9 @@ int verbose = 0;
} catch (DbException e) { \
if (e.get_errno()!=expect) fprintf(stderr, "err=%d %s\n", e.get_errno(), db_strerror(e.get_errno())); \
assert(e.get_errno()==expect); \
} \
})
}
void test_env_exceptions (void) {
static void test_env_exceptions (void) {
{
DbEnv env(0);
TC(env.open("no.such.dir", DB_INIT_MPOOL | DB_CREATE | DB_PRIVATE, 0777), ENOENT);
@@ -83,7 +81,7 @@ void test_env_exceptions (void) {
}
void test_db_exceptions (void) {
static void test_db_exceptions (void) {
DbEnv env(0);
TC(env.open(".", DB_INIT_MPOOL | DB_CREATE | DB_PRIVATE , 0777), 0);
TC( ({ Db db(&env, -1); assert(0); }), EINVAL); // Create with flags=-1 should do an EINVAL
@@ -148,7 +146,7 @@ void test_db_exceptions (void) {
}
void test_dbc_exceptions () {
static void test_dbc_exceptions () {
DbEnv env(0);
TC(env.open(".", DB_INIT_MPOOL | DB_CREATE | DB_PRIVATE , 0777), 0);
Db db(&env, 0);