提交 e3351bf0 authored 作者: Noel Grandin's avatar Noel Grandin

re-arrange our CI tests a little, and make multithreaded a first class citizen

上级 e246d438
...@@ -535,6 +535,7 @@ kill -9 `jps -l | grep "org.h2.test." | cut -d " " -f 1` ...@@ -535,6 +535,7 @@ kill -9 `jps -l | grep "org.h2.test." | cut -d " " -f 1`
private void testAll() throws Exception { private void testAll() throws Exception {
runTests(); runTests();
if (!fast) {
Profiler prof = new Profiler(); Profiler prof = new Profiler();
prof.depth = 16; prof.depth = 16;
prof.interval = 1; prof.interval = 1;
...@@ -544,6 +545,7 @@ kill -9 `jps -l | grep "org.h2.test." | cut -d " " -f 1` ...@@ -544,6 +545,7 @@ kill -9 `jps -l | grep "org.h2.test." | cut -d " " -f 1`
System.out.println(prof.getTop(5)); System.out.println(prof.getTop(5));
TestPerformance.main("-init", "-db", "1", "-size", "1000"); TestPerformance.main("-init", "-db", "1", "-size", "1000");
} }
}
/** /**
* Run all tests in all possible combinations. * Run all tests in all possible combinations.
...@@ -583,18 +585,33 @@ kill -9 `jps -l | grep "org.h2.test." | cut -d " " -f 1` ...@@ -583,18 +585,33 @@ kill -9 `jps -l | grep "org.h2.test." | cut -d " " -f 1`
smallLog = big = networked = memory = ssl = false; smallLog = big = networked = memory = ssl = false;
diskResult = traceSystemOut = diskUndo = false; diskResult = traceSystemOut = diskUndo = false;
mvcc = false;
traceTest = stopOnError = false; traceTest = stopOnError = false;
defrag = false; defrag = false;
traceLevelFile = throttle = 0; traceLevelFile = throttle = 0;
cipher = null; cipher = null;
// splitFileSystem = true;
// memory is a good match for multi-threaded, makes things happen faster, more change of exposing
// race conditions
memory = true;
multiThreaded = true;
test();
testUnit();
// but sometimes race conditions need bigger windows
memory = false;
multiThreaded = true;
test();
testUnit();
// a more normal setup
memory = false;
multiThreaded = false;
test(); test();
testUnit(); testUnit();
networked = true;
memory = true; memory = true;
splitFileSystem = false; multiThreaded = false;
networked = true;
test(); test();
memory = false; memory = false;
...@@ -635,12 +652,8 @@ kill -9 `jps -l | grep "org.h2.test." | cut -d " " -f 1` ...@@ -635,12 +652,8 @@ kill -9 `jps -l | grep "org.h2.test." | cut -d " " -f 1`
big = false; big = false;
cipher = "AES"; cipher = "AES";
test(); test();
mvcc = true;
cipher = null; cipher = null;
test(); test();
memory = true;
test();
} }
} }
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论