Merge branch 'master' into sto

This commit is contained in:
Ivan Skytte Jørgensen
2017-11-24 17:18:50 +01:00
2 changed files with 10 additions and 4 deletions

12
Jenkinsfile vendored

@ -67,13 +67,19 @@ pipeline {
steps {
parallel(
'unit test': {
sh "cd ${env.GB_DIR} && make -j8 unittest"
timeout(time: 10, unit: 'MINUTES') {
sh "cd ${env.GB_DIR} && make -j8 unittest"
}
},
'system test (single)': {
sh "cd ${env.PYWEBTEST_DIR} && ./run_all_testcases.py --num-instances=1 --num-shards=1 --offset=0"
timeout(time: 30, unit: 'MINUTES') {
sh "cd ${env.PYWEBTEST_DIR} && ./run_all_testcases.py --num-instances=1 --num-shards=1 --offset=0"
}
},
'system test (multiple)': {
sh "cd ${env.PYWEBTEST_DIR} && ./run_all_testcases.py --num-instances=4 --num-shards=2 --offset=1"
timeout(time: 30, unit: 'MINUTES') {
sh "cd ${env.PYWEBTEST_DIR} && ./run_all_testcases.py --num-instances=4 --num-shards=2 --offset=1"
}
}
)
}

@ -35,7 +35,7 @@ static void generateSummary( Summary &summary, char *htmlInput, const char *quer
ASSERT_TRUE(sections.set(&words, &bits, &url, "", CT_HTML));
Query query;
ASSERT_TRUE(query.set2(queryStr, langEnglish, true, true, false));
ASSERT_TRUE(query.set2(queryStr, langEnglish, true, true, false, ABS_MAX_QUERY_TERMS));
LinkInfo linkInfo;
memset ( &linkInfo , 0 , sizeof(LinkInfo) );