Commit 79b6d4f5 authored by Emmanuel Thomé's avatar Emmanuel Thomé
Browse files

Merge branch 'master' of gitlab.inria.fr:cado-nfs/cado-nfs

parents 1ca5292f 6252ca57
Pipeline #259347 passed with stages
in 49 minutes and 59 seconds
......@@ -1163,6 +1163,7 @@ tests/linalg/bwc/test_hello.c
tests/ncpus.sh
tests/scripts/CMakeLists.txt
tests/scripts/cadofactor/CMakeLists.txt
tests/scripts/cadofactor/test_wudb_cmdline.sh
tests/provide-wdir.sh
tests/utils/test_mpz_vector.c
linalg/bwc/blocklanczos.cpp
......
......@@ -1849,10 +1849,12 @@ if __name__ == '__main__': # {
prio = int(args["prio"][0])
limit = args["limit"]
db = DBFactory('db:sqlite3://%s' % dbname)
if use_pool:
db_pool = DbThreadPool(dbname)
db_pool = DbThreadPool(db)
else:
db_pool = WuAccess(dbname)
db_pool = WuAccess(db)
if args["create"]:
db_pool.create_tables()
......
......@@ -22,3 +22,7 @@ foreach (doctest_source ${PYTHON_DOCTEST_SOURCES})
TEST_DEPENDENCIES)
set_tests_properties(test_python_${basename} PROPERTIES RUN_SERIAL 1)
endforeach (doctest_source)
cado_define_test(test_wudb_cmdline
SCRIPT "${CMAKE_CURRENT_SOURCE_DIR}/test_wudb_cmdline.sh" "${CADO_NFS_SOURCE_DIR}/scripts/cadofactor/"
)
#!/usr/bin/env bash
SCRIPTDIR="$1"
# The correct string has a sneaky whitespace at the end of the first line
CORRECT_OUTPUT="All existing workunits:
0"
if test -z "$SCRIPTDIR"
then
echo "SCRIPTDIR parameter must be supplied"
exit 1
fi
rm -f test.db
if ! "$SCRIPTDIR"/wudb.py -dbfile test.db -create || \
! OUTPUT=`"$SCRIPTDIR"/wudb.py -dbfile test.db -all -dump` ||
[ "$OUTPUT" != "$CORRECT_OUTPUT" ]
then
rm -f test.db
exit 1
fi
rm -f test.db
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment