mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-01 11:31:51 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

#137 fix osx build problem

Browse source
This commit is contained in:
Rich Prohaska 2014-01-07 03:57:20 -05:00
parent f64edcc463
commit dddda9d622
2 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/tests/CMakeLists.txt
View file

@ -67,6 +67,7 @@ if(BUILD_TESTING OR BUILD_SRC_TESTS)
dump-env
env_loader_memory
env-put-multiple
env_nproc
env_startup
execute-updates
filesize

12
src/tests/env_nproc.cc
View file

@ -93,8 +93,7 @@ PATENT RIGHTS GRANT:
#include <db.h>
#include <sys/resource.h>
static int env_open_close(void) {
int result = 0;
static void env_open_close(void) {
int r;
DB_ENV *env = NULL;
@ -104,11 +103,9 @@ static int env_open_close(void) {
r = env->open(env, TOKU_TEST_FILENAME, DB_INIT_LOCK+DB_INIT_MPOOL+DB_INIT_TXN+DB_INIT_LOG + DB_CREATE + DB_PRIVATE, S_IRWXU+S_IRWXG+S_IRWXO);
if (r != 0) {
fprintf(stderr, "%s:%u r=%d\n", __FILE__, __LINE__, r);
result = r;
}
r = env->close(env, 0);
assert(r == 0);
return result;
}
int test_main (int argc, char * const argv[]) {
@ -127,7 +124,7 @@ int test_main (int argc, char * const argv[]) {
}
limit = atoi(argv[i]);
continue;
}
}
toku_os_recursive_delete(TOKU_TEST_FILENAME);
r = toku_os_mkdir(TOKU_TEST_FILENAME, S_IRWXU+S_IRWXG+S_IRWXO);
@ -135,13 +132,12 @@ int test_main (int argc, char * const argv[]) {
struct rlimit nproc_rlimit;
r = getrlimit(RLIMIT_NPROC, &nproc_rlimit);
assert(r == 0);
nproc_rlimit.rlim_cur = limit;
r = setrlimit(RLIMIT_NPROC, &nproc_rlimit);
assert(r == 0);
printf("nproc %lu\n", nproc_rlimit.rlim_cur);
(void) env_open_close();
env_open_close();
return 0;
}