Merge branch 'more_data_structures' of...

Merge branch 'more_data_structures' of dbgit.prakinf.tu-ilmenau.de:code/nvm-based_data_structures into more_data_structures

Conflicts:
	CMakeLists.txt
	src/utils/PatriciaUtils.hpp
	test/BaseTrieTest.cpp
	test/CMakeLists.txt
	test/PatriciaTest.cpp
3 jobs for more_data_structures in 2 minutes and 12 seconds (queued for 3 seconds)
Status Job ID Name Coverage
  Build
failed #1771
grouprunner
build

00:02:12

failed #1772
grouprunner
coverage

00:01:49

 
  Test
skipped #1773
grouprunner
test
 
Name Stage Failure
failed
build Build
make[1]: *** [CMakeFiles/Makefile2:655: test/CMakeFiles/PatriciaTest.dir/all] Error 2
make[1]: *** Waiting for unfinished jobs....
[ 76%] Linking CXX executable PTableInfoTest
[ 76%] Built target PTableInfoTest
[ 77%] Linking CXX executable UnsortedPBPTreeTest
[ 77%] Built target UnsortedPBPTreeTest
make: *** [Makefile:141: all] Error 2
Authenticating with credentials from /root/.docker/config.json
ERROR: Job failed: exit code 1
failed
coverage Build
make[1]: *** [CMakeFiles/Makefile2:655: test/CMakeFiles/PatriciaTest.dir/all] Error 2
make[1]: *** Waiting for unfinished jobs....
[ 74%] Linking CXX executable PTableInfoTest
[ 75%] Linking CXX executable UnsortedPBPTreeTest
[ 75%] Built target PTableInfoTest
[ 75%] Built target UnsortedPBPTreeTest
make: *** [Makefile:141: all] Error 2
Authenticating with credentials from /root/.docker/config.json
ERROR: Job failed: exit code 1