Remove old unit test runner.

Remove unmaintained scripts to generate old style unit test skeletons.

13 files changed, 0 insertions, 1572 deletions

diff --git a/documentapi/src/tests/create-test.sh b/documentapi/src/tests/create-test.sh
deleted file mode 100755
index 9809d54d38b..00000000000
--- a/documentapi/src/tests/create-test.sh
+++ /dev/null
@@ -1,74 +0,0 @@
-#!/bin/sh
-# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-
-gen_ignore_file() {
-    echo "generating '$1' ..."
-    echo ".depend"       > $1
-    echo "Makefile"     >> $1
-    echo "${test}_test" >> $1
-}
-
-gen_project_file() {
-    echo "generating '$1' ..."
-    echo "APPLICATION ${test}_test"                                          > $1
-    echo "OBJS $test"                                                       >> $1
-    echo "LIBS documentapi/documentapi"                                     >> $1
-    echo "EXTERNALLIBS vespalib vespalog document config messagebus-test"   >> $1
-    echo "EXTERNALLIBS messagebus config slobrokserver vespalib"            >> $1
-    echo ""                                                                 >> $1
-    echo "CUSTOMMAKE"                                                       >> $1
-    echo "test: depend ${test}_test"                                        >> $1
-    echo -e "\t@./${test}_test"                                             >> $1
-}
-
-gen_source() {
-    echo "generating '$1' ..."
-    echo "#include <vespa/vespalib/testkit/testapp.h>" > $1
-    echo ""                                      >> $1
-    echo "#include <vespa/log/log.h>"            >> $1
-    echo "LOG_SETUP(\"${test}_test\");"          >> $1
-    echo ""                                      >> $1
-    echo "//using namespace documentapi;"        >> $1
-    echo ""                                      >> $1
-    echo "TEST_SETUP(Test);"                     >> $1
-    echo ""                                      >> $1
-    echo "int"                                   >> $1
-    echo "Test::Main()"                          >> $1
-    echo "{"                                     >> $1
-    echo "    TEST_INIT(\"${test}_test\");"      >> $1
-    echo "    TEST_DONE();"                      >> $1
-    echo "}"                                     >> $1
-}
-
-gen_desc() {
-    echo "generating '$1' ..."
-    echo "$test test. Take a look at $test.cpp for details." > $1
-}
-
-gen_file_list() {
-    echo "generating '$1' ..."
-    echo "$test.cpp" > $1
-}
-
-if [ $# -ne 1 ]; then
-	echo "usage: $0 <name>"
-	echo "  name: name of the test to create"
-	exit 1
-fi
-
-test=$1
-if [ -e $test ]; then
-    echo "$test already present, don't want to mess it up..."
-    exit 1
-fi
-
-echo "creating directory '$test' ..."
-mkdir -p $test || exit 1
-cd $test || exit 1
-test=`basename $test`
-
-gen_ignore_file  .cvsignore
-gen_project_file fastos.project
-gen_source       $test.cpp
-gen_desc         DESC
-gen_file_list    FILES
diff --git a/messagebus/src/tests/create-test.sh b/messagebus/src/tests/create-test.sh
deleted file mode 100755
index cf979d56ddd..00000000000
--- a/messagebus/src/tests/create-test.sh
+++ /dev/null
@@ -1,74 +0,0 @@
-#!/bin/sh
-# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-
-gen_ignore_file() {
-    echo "generating '$1' ..."
-    echo ".depend"       > $1
-    echo "Makefile"     >> $1
-    echo "${test}_test" >> $1
-}
-
-gen_project_file() {
-    echo "generating '$1' ..."
-    echo "APPLICATION ${test}_test"                                          > $1
-    echo "OBJS $test"                                                       >> $1
-    echo "LIBS messagebus/testlib/messagebus-test"                          >> $1
-    echo "LIBS messagebus/messagebus"                                       >> $1
-    echo "EXTERNALLIBS slobrokserver slobrok fnet vespalib config vespalog" >> $1
-    echo ""                                                                 >> $1
-    echo "CUSTOMMAKE"                                                       >> $1
-    echo "test: depend ${test}_test"                                        >> $1
-    echo -e "\t@./${test}_test"                                             >> $1
-}
-
-gen_source() {
-    echo "generating '$1' ..."
-    echo "#include <vespa/vespalib/testkit/testapp.h>" > $1
-    echo ""                                            >> $1
-    echo "#include <vespa/log/log.h>"            >> $1
-    echo "LOG_SETUP(\"${test}_test\");"          >> $1
-    echo ""                                      >> $1
-    echo "// using namespace mbus;"              >> $1
-    echo ""                                      >> $1
-    echo "TEST_SETUP(Test);"                     >> $1
-    echo ""                                      >> $1
-    echo "int"                                   >> $1
-    echo "Test::Main()"                          >> $1
-    echo "{"                                     >> $1
-    echo "    TEST_INIT(\"${test}_test\");"      >> $1
-    echo "    TEST_DONE();"                      >> $1
-    echo "}"                                     >> $1
-}
-
-gen_desc() {
-    echo "generating '$1' ..."
-    echo "$test test. Take a look at $test.cpp for details." > $1
-}
-
-gen_file_list() {
-    echo "generating '$1' ..."
-    echo "$test.cpp" > $1
-}
-
-if [ $# -ne 1 ]; then
-	echo "usage: $0 <name>"
-	echo "  name: name of the test to create"
-	exit 1
-fi
-
-test=$1
-if [ -e $test ]; then
-    echo "$test already present, don't want to mess it up..."
-    exit 1
-fi
-
-echo "creating directory '$test' ..."
-mkdir -p $test || exit 1
-cd $test || exit 1
-test=`basename $test`
-
-gen_ignore_file  .cvsignore
-gen_project_file fastos.project
-gen_source       $test.cpp
-gen_desc         DESC
-gen_file_list    FILES
diff --git a/searchcore/src/tests/proton/create-test.sh b/searchcore/src/tests/proton/create-test.sh
deleted file mode 100644
index e210d609972..00000000000
--- a/searchcore/src/tests/proton/create-test.sh
+++ /dev/null
@@ -1,72 +0,0 @@
-#!/bin/sh
-# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-
-gen_ignore_file() {
-    echo "generating '$1' ..."
-    echo ".depend"       > $1
-    echo "Makefile"     >> $1
-    echo "${test}_test" >> $1
-}
-
-gen_project_file() {
-    echo "generating '$1' ..."
-    echo "APPLICATION ${test}_test"               > $1
-    echo "OBJS $test"                            >> $1
-    echo "EXTERNALLIBS searchlib document fnet"  >> $1
-    echo "EXTERNALLIBS vespalib config vespalog" >> $1
-    echo ""                                      >> $1
-    echo "CUSTOMMAKE"                            >> $1
-    echo "test: ${test}_test"                    >> $1
-    echo -e "\t\$(VALGRIND) ./${test}_test"      >> $1
-}
-
-gen_source() {
-    echo "generating '$1' ..."
-    echo "#include <vespa/log/log.h>"                   > $1
-    echo "LOG_SETUP(\"${test}_test\");"          >> $1
-    echo "#include <vespa/vespalib/testkit/testapp.h>" >> $1
-    echo ""                                      >> $1
-    echo "// using namespace ;"                  >> $1
-    echo ""                                      >> $1
-    echo "TEST_SETUP(Test);"                     >> $1
-    echo ""                                      >> $1
-    echo "int"                                   >> $1
-    echo "Test::Main()"                          >> $1
-    echo "{"                                     >> $1
-    echo "    TEST_INIT(\"${test}_test\");"      >> $1
-    echo "    TEST_DONE();"                      >> $1
-    echo "}"                                     >> $1
-}
-
-gen_desc() {
-    echo "generating '$1' ..."
-    echo "$test test. Take a look at $test.cpp for details." > $1
-}
-
-gen_file_list() {
-    echo "generating '$1' ..."
-    echo "$test.cpp" > $1
-}
-
-if [ $# -ne 1 ]; then
-	echo "usage: $0 <name>"
-	echo "  name: name of the test to create"
-	exit 1
-fi
-
-test=$1
-if [ -e $test ]; then
-    echo "$test already present, don't want to mess it up..."
-    exit 1
-fi
-
-echo "creating directory '$test' ..."
-mkdir -p $test || exit 1
-cd $test || exit 1
-test=`basename $test`
-
-gen_ignore_file  .cvsignore
-gen_project_file fastos.project
-gen_source       $test.cpp
-gen_desc         DESC
-gen_file_list    FILES
diff --git a/searchlib/src/tests/create-test.sh b/searchlib/src/tests/create-test.sh
deleted file mode 100755
index cddedd8f407..00000000000
--- a/searchlib/src/tests/create-test.sh
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/sh
-# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-
-gen_project_file() {
-    echo "generating '$1' ..."
-    echo "APPLICATION ${test}_test"                                          > $1
-    echo "OBJS ${test}_test"                                                >> $1
-    echo "LIBS searchlib/searchlib"                                         >> $1
-    echo "EXTERNALLIBS searchcommon persistencetypes metrics"               >> $1
-    echo ""                                                                 >> $1
-    echo "CUSTOMMAKE"                                                       >> $1
-    echo "test: all"                                                        >> $1
-    echo -e "\t\$(HIDE) \$(LDL) \$(VALGRIND) ./${test}_test"                >> $1
-}
-
-gen_source() {
-    echo "generating '$1' ..."
-    echo "#include <vespa/vespalib/testkit/test_kit.h>" >> $1
-    echo ""                                       >> $1
-    echo "// using namespace search;"             >> $1
-    echo ""                                       >> $1
-    echo "TEST(\"require something\") {"          >> $1
-    echo "}"                                      >> $1
-    echo ""                                       >> $1
-    echo "TEST_MAIN() { TEST_RUN_ALL(); }"        >> $1
-}
-
-gen_file_list() {
-    echo "generating '$1' ..."
-    echo "${test}_test.cpp" > $1
-}
-
-if [ $# -ne 1 ]; then
-	echo "usage: $0 <name>"
-	echo "  name: name of the test to create"
-	exit 1
-fi
-
-test=$1
-if [ -e $test ]; then
-    echo "$test already present, don't want to mess it up..."
-    exit 1
-fi
-
-echo "creating directory '$test' ..."
-mkdir -p $test || exit 1
-cd $test || exit 1
-test=`basename $test`
-
-gen_project_file fastos.project
-gen_source       ${test}_test.cpp
-gen_file_list    FILES
diff --git a/staging_vespalib/src/tests/create-test.sh b/staging_vespalib/src/tests/create-test.sh
deleted file mode 100755
index bf1893855cb..00000000000
--- a/staging_vespalib/src/tests/create-test.sh
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/bin/sh
-# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-
-gen_project_file() {
-    echo "generating '$1' ..."
-    echo "APPLICATION ${test}_test"               > $1
-    echo "OBJS ${test}_test"                     >> $1
-    echo "LIBS vespalib/staging_vespalib"        >> $1
-    echo "EXTERNALLIBS vespalib vespalog"        >> $1
-    echo ""                                      >> $1
-    echo "CUSTOMMAKE"                            >> $1
-    echo "test: depend ${test}_test"             >> $1
-    echo -e "\t@./${test}_test"                  >> $1
-}
-
-gen_source() {
-    echo "generating '$1' ..."
-    echo "#include <vespa/vespalib/testkit/testapp.h>" > $1
-    echo "#include <vespa/log/log.h>"            >> $1
-    echo "LOG_SETUP(\"${test}_test\");"          >> $1
-    echo ""                                      >> $1
-    echo "using namespace vespalib;"             >> $1
-    echo ""                                      >> $1
-    echo "TEST_SETUP(Test);"                     >> $1
-    echo ""                                      >> $1
-    echo "int"                                   >> $1
-    echo "Test::Main()"                          >> $1
-    echo "{"                                     >> $1
-    echo "    TEST_INIT(\"${test}_test\");"      >> $1
-    echo "    TEST_DONE();"                      >> $1
-    echo "}"                                     >> $1
-}
-
-gen_desc() {
-    echo "generating '$1' ..."
-    echo "$test test. Take a look at ${test}_test.cpp for details." > $1
-}
-
-gen_file_list() {
-    echo "generating '$1' ..."
-    echo "${test}_test.cpp" > $1
-}
-
-if [ $# -ne 1 ]; then
-	echo "usage: $0 <name>"
-	echo "  name: name of the test to create"
-	exit 1
-fi
-
-test=$1
-if [ -e $test ]; then
-    echo "$test already present, don't want to mess it up..."
-    exit 1
-fi
-
-echo "creating directory '$test' ..."
-mkdir -p $test || exit 1
-cd $test || exit 1
-test=`basename $test`
-
-gen_project_file fastos.project
-gen_source       ${test}_test.cpp
-gen_desc         DESC
-gen_file_list    FILES
diff --git a/vbench/src/tests/create-test.sh b/vbench/src/tests/create-test.sh
deleted file mode 100755
index ce5c9d2dec4..00000000000
--- a/vbench/src/tests/create-test.sh
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/bin/sh
-# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-
-gen_project_file() {
-    echo "generating '$1' ..."
-    echo "APPLICATION ${test}_test"                  > $1
-    echo "OBJS ${test}_test"                        >> $1
-    echo "LIBS vbench/test/test"                    >> $1
-    echo "LIBS vbench/vbench"                       >> $1
-    echo "EXTERNALLIBS staging_vespalib"            >> $1
-    echo ""                                         >> $1
-    echo "CUSTOMMAKE"                               >> $1
-    echo "test: ${test}_test"                       >> $1
-    echo -e "\t\$(LDL) \$(VALGRIND) ./${test}_test" >> $1
-}
-
-gen_source() {
-    echo "generating '$1' ..."
-    echo "#include <vespa/vespalib/testkit/testapp.h>"  >> $1
-    echo "#include <vbench/test/all.h>"           >> $1
-    echo ""                                       >> $1
-    echo "using namespace vbench;"                >> $1
-    echo ""                                       >> $1
-    echo "TEST(\"foo\") {"                        >> $1
-    echo "    EXPECT_TRUE(true);"                 >> $1
-    echo "}"                                      >> $1
-    echo ""                                       >> $1
-    echo "TEST_MAIN() { TEST_RUN_ALL(); }"        >> $1
-}
-
-gen_file_list() {
-    echo "generating '$1' ..."
-    echo "${test}_test.cpp" > $1
-}
-
-if [ $# -ne 1 ]; then
-	echo "usage: $0 <name>"
-	echo "  name: name of the test to create"
-	exit 1
-fi
-
-test=$1
-if [ -e $test ]; then
-    echo "$test already present, don't want to mess it up..."
-    exit 1
-fi
-
-echo "creating directory '$test' ..."
-mkdir -p $test || exit 1
-cd $test || exit 1
-test=`basename $test`
-
-gen_project_file fastos.project
-gen_source       ${test}_test.cpp
-gen_file_list    FILES
diff --git a/vespalib/src/tests/create-test.sh b/vespalib/src/tests/create-test.sh
deleted file mode 100755
index 297be94ef1a..00000000000
--- a/vespalib/src/tests/create-test.sh
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/bin/sh
-# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-
-gen_project_file() {
-    echo "generating '$1' ..."
-    echo "APPLICATION ${test}_test"                > $1
-    echo "OBJS ${test}_test"                      >> $1
-    echo "LIBS vespa/vespalib/vespalib"           >> $1
-    echo "EXTERNALLIBS vespalog"                  >> $1
-    echo ""                                       >> $1
-    echo "CUSTOMMAKE"                             >> $1
-    echo "test: all"                              >> $1
-    echo -e "\t\$(HIDE) \$(LDL) \$(VALGRIND) ./${test}_test"   >> $1
-}
-
-gen_source() {
-    echo "generating '$1' ..."
-    echo "#include <vespa/vespalib/testkit/test_kit.h>" > $1
-    echo ""                                       >> $1
-    echo "using namespace vespalib;"              >> $1
-    echo ""                                       >> $1
-    echo "TEST(\"require something\") {"          >> $1
-    echo "    EXPECT_TRUE(true);"                 >> $1
-    echo "}"                                      >> $1
-    echo ""                                       >> $1
-    echo "TEST_MAIN() { TEST_RUN_ALL(); }"        >> $1
-}
-
-gen_file_list() {
-    echo "generating '$1' ..."
-    echo "${test}_test.cpp" > $1
-}
-
-if [ $# -ne 1 ]; then
-	echo "usage: $0 <name>"
-	echo "  name: name of the test to create"
-	exit 1
-fi
-
-test=$1
-if [ -e $test ]; then
-    echo "$test already present, don't want to mess it up..."
-    exit 1
-fi
-
-echo "creating directory '$test' ..."
-mkdir -p $test || exit 1
-cd $test || exit 1
-test=`basename $test`
-
-gen_project_file fastos.project
-gen_source       ${test}_test.cpp
-gen_file_list    FILES
diff --git a/vespalib/src/vespa/vespalib/testkit/create-test.sh b/vespalib/src/vespa/vespalib/testkit/create-test.sh
deleted file mode 100755
index d92ebd08fd5..00000000000
--- a/vespalib/src/vespa/vespalib/testkit/create-test.sh
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/bin/sh
-# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-
-gen_ignore_file() {
-    echo "generating '$1' ..."
-    echo ".depend"       > $1
-    echo "Makefile"     >> $1
-    echo "${test}_test" >> $1
-}
-
-gen_project_file() {
-    echo "generating '$1' ..."
-    echo "APPLICATION ${test}_test"                                     > $1
-    echo "OBJS $test"                                                  >> $1
-    echo "LIBS vespalib/vespalib"                                      >> $1
-    echo "EXTERNALLIBS log"                                            >> $1
-    echo ""                                                            >> $1
-    echo "CUSTOMMAKE"                                                  >> $1
-    echo "test: depend ${test}_test"                                   >> $1
-    echo -e "\t@./${test}_test"                                        >> $1
-}
-
-gen_source() {
-    echo "generating '$1' ..."
-    echo "#include <vespa/vespalib/testkit/testapp.h>" >> $1
-    echo ""                                      >> $1
-    echo "TEST_SETUP(Test);"                     >> $1
-    echo ""                                      >> $1
-    echo "int"                                   >> $1
-    echo "Test::Main()"                          >> $1
-    echo "{"                                     >> $1
-    echo "    TEST_INIT(\"${test}_test\");"      >> $1
-    echo "    TEST_DONE();"                      >> $1
-    echo "}"                                     >> $1
-}
-
-gen_desc() {
-    echo "generating '$1' ..."
-    echo "$test test. Take a look at $test.cpp for details." > $1
-}
-
-gen_file_list() {
-    echo "generating '$1' ..."
-    echo "$test.cpp" > $1
-}
-
-if [ $# -ne 1 ]; then
-	echo "usage: $0 <name>"
-	echo "  name: name of the test to create"
-	exit 1
-fi
-
-test=$1
-if [ -e $test ]; then
-    echo "$test already present, don't want to mess it up..."
-    exit 1
-fi
-
-echo "creating directory '$test' ..."
-mkdir -p $test || exit 1
-cd $test || exit 1
-test=`basename $test`
-
-gen_ignore_file  .cvsignore
-gen_project_file fastos.project
-gen_source       $test.cpp
-gen_desc         DESC
-gen_file_list    FILES
diff --git a/vespalib/src/vespa/vespalib/testkit/generate-test-makefile.sh b/vespalib/src/vespa/vespalib/testkit/generate-test-makefile.sh
deleted file mode 100755
index 8e172d8d01d..00000000000
--- a/vespalib/src/vespa/vespalib/testkit/generate-test-makefile.sh
+++ /dev/null
@@ -1,71 +0,0 @@
-#!/bin/sh
-# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-dirname=`dirname $0`
-basedir=`readlink -f $dirname`
-progname=`basename $0 .sh`
-if [ $# -lt 3 ]; then
-	echo "usage: $0 <rundir> <testlist> <top>"
-	echo "  rundir: where to run and generate output"
-	echo "  testlist: file with test names (relative to rundir)"
-	echo "  top: path to top (relative to rundir)"
-	exit 1
-fi
-
-rundir=$1
-mkdir -p $1
-cd $1 || exit 1
-testlistfile=$2
-testlist=`cat $2` || exit 1
-top_path=$3
-testmakefile=Makefile
-rm -f $testmakefile
-
-# Generate all target
-echo "all:" >> $testmakefile
-echo -e "\t\$(MAKE) clean" >> $testmakefile
-echo -e "\t\$(MAKE) init" >> $testmakefile
-echo -e "\t\$(MAKE) runtests" >> $testmakefile
-echo -e "\t\$(MAKE) generate-report" >> $testmakefile
-
-# Generate targets for each test
-testnamelist=""
-test_cnt=0
-for test in $testlist; do
-    test_cnt=$(($test_cnt + 1))
-
-    testpath=$test
-    case $test in
-    \!*) testpath=${test#!};;
-    \?*) testpath=${test#?};;
-    esac
-    test_name="test-"`echo $testpath | sed -e "s=^tests/==;s=/=.=g"`
-    testnamelist="$testnamelist $test_name"
-
-    echo "" >> $testmakefile
-    echo "$test_name:" >> $testmakefile
-    echo -e "\t@sh $basedir/run-test.sh . $test $test_cnt $top_path" >> $testmakefile
-done
-
-echo "" >> $testmakefile
-echo "init:" >> $testmakefile
-echo -e "\tdate +%s > tmp.start-time" >> $testmakefile
-echo "" >> $testmakefile
-echo -e "runtests:$testnamelist" >> $testmakefile
-
-# Generate generate report target
-echo "" >> $testmakefile
-echo "generate-report:" >> $testmakefile
-echo -e "\t@sh $basedir/generate-test-report.sh . $testlistfile" >> $testmakefile
-
-# Generate clean target
-echo "" >> $testmakefile
-echo "clean:" >> $testmakefile
-echo -e "\trm -f test-report.html" >> $testmakefile
-echo -e "\trm -f test-report.html.top" >> $testmakefile
-echo -e "\trm -f test-report.html.bottom" >> $testmakefile
-echo -e "\trm -f test-report.html.entry" >> $testmakefile
-echo -e "\trm -f test-report.html.summary" >> $testmakefile
-echo -e "\trm -f test.*.*.files.html" >> $testmakefile
-echo -e "\trm -f test.*.*.file.*" >> $testmakefile
-echo -e "\trm -f test-report.json" >> $testmakefile
-echo -e "\trm -f tmp.*" >> $testmakefile
diff --git a/vespalib/src/vespa/vespalib/testkit/generate-test-report.sh b/vespalib/src/vespa/vespalib/testkit/generate-test-report.sh
deleted file mode 100755
index acb17d4ba65..00000000000
--- a/vespalib/src/vespa/vespalib/testkit/generate-test-report.sh
+++ /dev/null
@@ -1,210 +0,0 @@
-#!/bin/sh
-# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-
-top_color="bgcolor=\"#ccccff\""
-row_color="bgcolor=\"#eeeeff\""
-pass_color="bgcolor=\"#ccffcc\""
-fail_color="bgcolor=\"#ffcccc\""
-ignore_color="bgcolor=\"#ffffcc\""
-
-#
-# Generate top of HTML report
-# $1 - output file
-#
-gen_report_top() {
-    dst=$1
-    date=`date "+%Y-%m-%d %H:%M:%S"`
-    echo "<html>" > $dst
-    echo "<title>Test Report ($date)</title>" >> $dst
-    echo "<body bgcolor=\"#ffffff\">" >> $dst
-    echo "<h1>Test Report ($date)</h1>" >> $dst
-}
-
-#
-# Generate top of JSON report
-# $1 - output file
-#
-gen_report_top_json() {
-    dst=$1
-    echo "{" >> $dst
-}
-
-#
-# Generate bottom of HTML report
-# $1 - output file
-#
-gen_report_bottom() {
-    dst=$1
-    echo "</body>" > $dst
-    echo "</html>" >> $dst
-}
-
-#
-# Generate bottom of JSON report
-# $1 - output file
-#
-gen_report_bottom_json() {
-    dst=$1
-    echo "}" >> $dst
-}
-
-#
-# Generate top of test table
-# $1 - output file
-#
-gen_report_entry_init() {
-    dst=$1
-    echo "<h2>Details</h2>" > $dst
-    echo "<table cellspacing=\"2\" cellpadding=\"5\" border=\"0\">" >> $dst
-    echo "<tr>" >> $dst
-    echo "<th align=\"left\" $top_color>Test</th>" >> $dst
-    echo "<th align=\"left\" $top_color>Result</th>" >> $dst
-    echo "<th align=\"left\" $top_color>Time (s)</th>" >> $dst
-    echo "</tr>" >> $dst
-}
-
-#
-# Generate top of tests entry
-# $1 - output file
-#
-gen_report_entry_init_json() {
-    dst=$1
-    echo "\"test_suites\": [" >> $dst
-}
-
-#
-# Generate bottom of test table
-# $1 - output file
-#
-gen_report_entry_fini() {
-    dst=$1
-    echo "</table>" >> $dst
-}
-
-#
-# Generate end of tests entry
-# $1 - output file
-#
-gen_report_entry_fini_json() {
-    dst=$1
-    echo "]," >> $dst
-}
-
-#
-# Generate test report summary
-# $1 - output file
-# $test_cnt   - total number of tests
-# $pass_cnt   - number of tests passed
-# $fail_cnt   - number of tests failed
-# $ignore_cnt - number of tests ignored
-# $elapsed    - total time spent tesing
-#
-gen_report_summary() {
-    dst=$1
-    echo "<h2>Summary</h2>" > $dst
-    echo "<table cellspacing=\"2\" cellpadding=\"5\" border=\"0\">" >> $dst
-    echo "<tr>" >> $dst
-    echo "<th align=\"left\" $top_color>Tests</th>" >> $dst
-    echo "<th align=\"left\" $top_color>Pass</th>" >> $dst
-    echo "<th align=\"left\" $top_color>Fail</th>" >> $dst
-    echo "<th align=\"left\" $top_color>Ignore</th>" >> $dst
-    echo "<th align=\"left\" $top_color>Time (s)</th>" >> $dst
-    echo "</tr>" >> $dst
-    echo "<tr>" >> $dst
-    echo "<td align=\"right\" $row_color>$test_cnt</td>" >> $dst
-    echo "<td align=\"right\" $row_color>$pass_cnt</td>" >> $dst
-    echo "<td align=\"right\" $row_color>$fail_cnt</td>" >> $dst
-    echo "<td align=\"right\" $row_color>$ignore_cnt</td>" >> $dst
-    echo "<td align=\"right\" $row_color>$elapsed</td>" >> $dst
-    echo "</tr>" >> $dst
-    echo "</table>" >> $dst
-}
-
-gen_report_summary_json() {
-    dst=$1
-    echo "\"summary\": {" >> $dst
-    echo "\"total\": $test_cnt," >> $dst
-    echo "\"pass\": $pass_cnt," >> $dst
-    echo "\"fail\": $fail_cnt," >> $dst
-    echo "\"ignore\": $ignore_cnt," >> $dst
-    echo "\"time\": $elapsed" >> $dst
-    echo "}" >> $dst
-}
-
-progname=`basename $0 .sh`
-if [ $# -lt 2 ]; then
-    echo "usage: $0 <rundir> <testlist>"
-    echo "  rundir: where to run and generate output"
-    echo "  testlist: file with test names (relative to rundir)"
-    exit 1
-fi
-
-rundir=$1
-testlist=`cat $2` || exit 1
-
-report=test-report.html
-jsonreport=test-report.json
-gen_report_top $report.top
-gen_report_top_json $jsonreport
-gen_report_entry_init $report.entry
-gen_report_entry_init_json $jsonreport
-
-test_cnt=0
-fail_cnt=0
-pass_cnt=0
-ignore_cnt=0
-for test in $testlist; do
-    test_cnt=$(($test_cnt + 1))
-    negate=false
-    ignore=false
-    case $test in
-    \!*) negate=true; prefix="[!]"; test=${test#!};;
-    \?*) ignore=true; prefix="[?]"; test=${test#?};;
-    esac
-    prefix=""
-    test_name="${prefix}"`echo $test | sed -e "s=^tests/==;s=/=.=g"`
-    test=`basename $test`
-    test_result=test.$test_cnt.$test_name.result
-    read result < $test_result
-    if [ $result -eq 0 ]; then
-    if $ignore; then
-        ignore_cnt=$(($ignore_cnt + 1))
-    else
-        pass_cnt=$(($pass_cnt + 1))
-    fi
-    else
-    if $ignore; then
-        ignore_cnt=$(($ignore_cnt + 1))
-    else
-        fail_cnt=$(($fail_cnt + 1))
-        cat test.$test_cnt.$test_name.log.file.txt
-    fi
-    fi
-    # Unfortunately, the JSON format is a bit context sensitive, so we need to do the old comma-before-entry-except-first logic
-    if [ $test_cnt -gt 1 ]; then
-        echo "," >> $jsonreport
-    fi
-    test_report=tmp.report.$test_name.json
-    cat $test_report >> $jsonreport
-    rm -f $test_report
-    rm -f $test_result
-done
-
-date +%s > tmp.end-time
-elapsed=$((`cat tmp.end-time` - `cat tmp.start-time`))
-gen_report_entry_fini $report.entry
-gen_report_entry_fini_json $jsonreport
-gen_report_summary $report.summary
-gen_report_summary_json $jsonreport
-gen_report_bottom $report.bottom
-gen_report_bottom_json $jsonreport
-cat $report.top $report.summary $report.entry $report.bottom > $report
-
-echo "summary: test/pass/fail/ignore: $test_cnt/$pass_cnt/$fail_cnt/$ignore_cnt"
-if [ $fail_cnt -eq 0 ]; then
-    echo "SUCCESS"
-    exit 0
-else
-    echo "FAILURE"
-    exit 1
-fi
diff --git a/vespalib/src/vespa/vespalib/testkit/run-test.sh b/vespalib/src/vespa/vespalib/testkit/run-test.sh
deleted file mode 100755
index ad68b4a190e..00000000000
--- a/vespalib/src/vespa/vespalib/testkit/run-test.sh
+++ /dev/null
@@ -1,241 +0,0 @@
-#!/bin/bash
-# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-set -e
-
-top_color="bgcolor=\"#ccccff\""
-row_color="bgcolor=\"#eeeeff\""
-pass_color="bgcolor=\"#ccffcc\""
-fail_color="bgcolor=\"#ffcccc\""
-ignore_color="bgcolor=\"#ffffcc\""
-
-
-#
-# Generate a single test table entry
-# $1 - output file
-# $test_name   - test name
-# $test_log    - href to test log
-# $test_desc   - href to test description (or 'false')
-# $test_files  - href to test files (or 'false')
-# $test_time   - timing info for test run
-#
-# $result - test outcome (0 means pass)
-# $ignore - ignore current test (true/false)
-#
-gen_report_entry() {
-    dst=$1
-    echo "<tr>" >> $dst
-    echo -n "<td $row_color>$test_name (" >> $dst
-    if [ $test_desc != "false" ]; then
-	echo -n "<a href=\"$test_desc\">desc</a> " >> $dst
-    fi
-    echo -n "<a href=\"$test_log\">log</a>" >> $dst
-    if [ $test_files != "false" ]; then
-	echo -n " <a href=\"$test_files\">files</a>" >> $dst
-    fi
-    echo -n ")</td>" >> $dst
-    if [ $result -eq 0 ]; then
-	if $ignore; then
-	    echo "<td $ignore_color>PASS</td>" >> $dst
-	else
-	    echo "<td $pass_color>PASS</td>" >> $dst
-	fi
-    else
-	if $ignore; then
-	    echo "<td $ignore_color>FAIL</td>" >> $dst
-	else
-	    echo "<td $fail_color>FAIL</td>" >> $dst
-	fi
-    fi
-    echo "<td $row_color>$test_time</td>" >> $dst
-    echo "</tr>" >> $dst
-}
-
-#
-# Generate a single test entry in JSON
-# Arguments same as for gen_report_entry()
-#
-gen_report_entry_json() {
-    dst=$1
-    echo "{" >> $dst
-    echo "\"name\": \"$test_name\"," >> $dst
-    local log=`cat $test_log | base64 -w 0`
-    echo "\"log\": \"$log\"," >> $dst
-    echo "\"ignored\": $ignore," >> $dst
-    echo "\"time\": $test_run_time," >> $dst
-    local success="true"
-    if [ $result == 0 ]; then
-        success="true"
-    else
-        success="false"
-    fi
-    echo "\"success\": $success" >> $dst
-    echo -n "}" >> $dst
-}
-
-get_file_size () {
-	if [ `uname` = FreeBSD ]; then
-	    stat -f "%z" "$1"
-	    return 0
-	fi
-	if [ `uname` = Linux ]; then
-	    stat -c "%s" "$1"
-	    return 0
-	fi
-	ls -l "$1" | awk '{print $5}'
-}
-
-#
-# Generate test file list
-# $1 - output file
-# $test_name - test name
-# $test_path - path to test
-# $test_cnt  - total number of tests (so far)
-#
-gen_file_list() {
-    dst=$1
-    echo "<html>" > $dst
-    echo "<title>File List for $test_name</title>" >> $dst
-    echo "<body bgcolor=\"#ffffff\">" >> $dst
-    echo "<h1>File List for $test_name</h1>" >> $dst
-    echo "<table cellspacing=\"2\" cellpadding=\"5\" border=\"0\">" >> $dst
-    echo "<tr>" >> $dst
-    echo "<th align=\"left\" $top_color>Filename</th>" >> $dst
-    echo "<th align=\"left\" $top_color>Size (bytes)</th>" >> $dst
-    echo "</tr>" >> $dst
-    filelist=`cat $test_path/FILES`
-    for file in $filelist; do
-	file_link=test.$test_cnt.$test_name.file.$file.txt
-	file_link=`echo "$file_link" | sed -e "s=/=.=g"`
-	echo "<tr>" >> $dst
-	if [ -f $test_path/$file ]; then
-	    cp $test_path/$file $file_link
-	    file_size=`get_file_size $file_link`
-	    echo "<td $row_color><a href=\"$file_link\">$file</a></td>" >> $dst
-	    echo "<td align=\"right\" $row_color>$file_size</td>" >> $dst
-	else
-	    echo "<td $row_color>$file</td>" >> $dst
-	    echo "<td align=\"right\" $row_color>not found</td>" >> $dst
-	fi
-	echo "</tr>" >> $dst
-    done
-    echo "</table>" >> $dst
-    echo "</body>" >> $dst
-    echo "</html>" >> $dst
-}
-
-#
-# Run one test
-#
-run_one_test() {
-    test=$1
-    test_cnt=$2
-    test_name=$3
-    test_path=$4
-    test_log=$5
-    test_result=$6
-    negate=$7
-    ignore=$8
-
-    rm -f tmp.$test_name.log-control
-    export VESPA_LOG_CONTROL_FILE=`pwd`/tmp.$test_name.log-control
-    # run test
-    local starttime=`date +%s`
-    /usr/bin/time -o tmp.${test}-time sh -c \
-	"(cd $test_path && $MAKE -s test $makeargs) > $test_log 2>&1"
-    result=$?
-    local endtime=`date +%s`
-    test_run_time=$(($endtime - $starttime))
-
-    #If you have run with valgrind check errors
-   if [ $result -eq 0 ]; then
-       valgrind_errors=`grep "ERROR SUMMARY" $test_log | cut -d ' ' -f4`
-       for r in $valgrind_errors
-       do
-           result=$(($result + $r))
-       done
-   fi
-
-    # handle test description
-    if [ -f $test_path/DESC ]; then
-	test_desc=test.$test_cnt.$test_name.desc.file.txt
-	cp $test_path/DESC $test_desc
-    else
-	test_desc="false"
-    fi
-
-    # handle test file list
-    if [ -f $test_path/FILES ]; then
-	test_files=test.$test_cnt.$test_name.files.html
-	gen_file_list $test_files
-    else
-	test_files="false"
-    fi
-
-    # handle test result negation
-    if $negate; then
-	if [ $result -eq 0 ]; then
-	    result=1
-	else
-	    result=0
-	fi
-    fi
-    result_string=""
-    if [ $result -eq 0 ]; then
-	if $ignore; then
-	    result_string="PASS (ignored)"
-	else
-	    result_string="PASS"
-	fi
-    else
-	if $ignore; then
-	    result_string="FAIL (ignored)"
-	else
-	    result_string="FAIL"
-	fi
-    fi
-
-    test_time=`cat tmp.${test}-time`
-    echo $test_name : $result_string
-    echo $result > $test_result
-    gen_report_entry $report.entry
-    gen_report_entry_json tmp.report.$test_name.json
-}
-
-progname=`basename $0 .sh`
-if [ $# -lt 4 ]; then
-	echo "usage: $0 <rundir> <test> <testid> <top>"
-	echo "  rundir: where to run and generate output"
-	echo "  test: content of testdir"
-    echo"   testid: unique id for this test (when run in parallel with other tests)"
-	echo "  top: path to top (relative to rundir)"
-	exit 1
-fi
-
-mkdir -p $1
-cd $1 || exit 1
-test=$2
-test_cnt=$3
-top_path=$4
-
-: ${MAKE:=gmake}
-unset MAKELEVEL
-
-report=test-report.html
-jsonreport=test-report.json
-
-negate=false
-ignore=false
-case $test in
-\!*) negate=true; prefix="[!]"; test=${test#!};;
-\?*) ignore=true; prefix="[?]"; test=${test#?};;
-esac
-prefix=""
-test_name="${prefix}"`echo $test | sed -e "s=^tests/==;s=/=.=g"`
-test_path=$top_path/$test
-test=`basename $test`
-test_log=test.$test_cnt.$test_name.log.file.txt
-test_result=test.$test_cnt.$test_name.result
-# run test
-echo "running test '$test_name' ... "
-
-run_one_test $test $test_cnt $test_name $test_path $test_log $test_result $negate $ignore
diff --git a/vespalib/src/vespa/vespalib/testkit/testrun.sh b/vespalib/src/vespa/vespalib/testkit/testrun.sh
deleted file mode 100755
index 5feffe30edf..00000000000
--- a/vespalib/src/vespa/vespalib/testkit/testrun.sh
+++ /dev/null
@@ -1,466 +0,0 @@
-#!/bin/bash
-# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-set -e
-
-top_color="bgcolor=\"#ccccff\""
-row_color="bgcolor=\"#eeeeff\""
-pass_color="bgcolor=\"#ccffcc\""
-fail_color="bgcolor=\"#ffcccc\""
-ignore_color="bgcolor=\"#ffffcc\""
-
-#
-# Generate top of HTML report
-# $1 - output file
-#
-gen_report_top() {
-    dst=$1
-    date=`date "+%Y-%m-%d %H:%M:%S"`
-    echo "<html>" > $dst
-    echo "<title>Test Report ($date)</title>" >> $dst
-    echo "<body bgcolor=\"#ffffff\">" >> $dst
-    echo "<h1>Test Report ($date)</h1>" >> $dst
-}
-
-#
-# Generate top of JSON report
-# $1 - output file
-#
-gen_report_top_json() {
-    dst=$1
-    echo "{" >> $dst
-}
-
-#
-# Generate bottom of HTML report
-# $1 - output file
-#
-gen_report_bottom() {
-    dst=$1
-    echo "</body>" > $dst
-    echo "</html>" >> $dst
-}
-
-#
-# Generate bottom of JSON report
-# $1 - output file
-#
-gen_report_bottom_json() {
-    dst=$1
-    echo "}" >> $dst
-}
-
-#
-# Generate top of test table
-# $1 - output file
-#
-gen_report_entry_init() {
-    dst=$1
-    echo "<h2>Details</h2>" > $dst
-    echo "<table cellspacing=\"2\" cellpadding=\"5\" border=\"0\">" >> $dst
-    echo "<tr>" >> $dst
-    echo "<th align=\"left\" $top_color>Test</th>" >> $dst
-    echo "<th align=\"left\" $top_color>Result</th>" >> $dst
-    echo "<th align=\"left\" $top_color>Time (s)</th>" >> $dst
-    echo "</tr>" >> $dst
-}
-
-#
-# Generate top of tests entry
-# $1 - output file
-#
-gen_report_entry_init_json() {
-    dst=$1
-    echo "\"test_suites\": [" >> $dst
-}
-
-#
-# Generate bottom of test table
-# $1 - output file
-#
-gen_report_entry_fini() {
-    dst=$1
-    echo "</table>" >> $dst
-}
-
-#
-# Generate end of tests entry
-# $1 - output file
-#
-gen_report_entry_fini_json() {
-    dst=$1
-    echo "]," >> $dst
-}
-
-#
-# Generate a single test table entry
-# $1 - output file
-# $test_name   - test name
-# $test_log    - href to test log
-# $test_desc   - href to test description (or 'false')
-# $test_files  - href to test files (or 'false')
-# $test_time   - timing info for test run
-#
-# $result - test outcome (0 means pass)
-# $ignore - ignore current test (true/false)
-#
-gen_report_entry() {
-    dst=$1
-    echo "<tr>" >> $dst
-    echo -n "<td $row_color>$test_name (" >> $dst
-    if [ $test_desc != "false" ]; then
-	echo -n "<a href=\"$test_desc\">desc</a> " >> $dst
-    fi
-    echo -n "<a href=\"$test_log\">log</a>" >> $dst
-    if [ $test_files != "false" ]; then
-	echo -n " <a href=\"$test_files\">files</a>" >> $dst
-    fi
-    echo -n ")</td>" >> $dst
-    if [ $result -eq 0 ]; then
-	if $ignore; then
-	    echo "<td $ignore_color>PASS</td>" >> $dst
-	else
-	    echo "<td $pass_color>PASS</td>" >> $dst
-	fi
-    else
-	if $ignore; then
-	    echo "<td $ignore_color>FAIL</td>" >> $dst
-	else
-	    echo "<td $fail_color>FAIL</td>" >> $dst
-	fi
-    fi
-    echo "<td $row_color>$test_time</td>" >> $dst
-    echo "</tr>" >> $dst
-}
-
-#
-# Generate a single test entry in JSON
-# Arguments same as for gen_report_entry()
-#
-gen_report_entry_json() {
-    dst=$1
-    echo "{" >> $dst
-    echo "\"name\": \"$test_name\"," >> $dst
-    local log=`cat $test_log | base64 -w 0`
-    echo "\"log\": \"$log\"," >> $dst
-    echo "\"ignored\": $ignore," >> $dst
-    echo "\"time\": $test_run_time," >> $dst
-    local success="true"
-    if [ $result == 0 ]; then
-        success="true"
-    else
-        success="false"
-    fi
-    echo "\"success\": $success" >> $dst
-    echo -n "}" >> $dst
-}
-
-#
-# Generate test report summary
-# $1 - output file
-# $test_cnt   - total number of tests
-# $pass_cnt   - number of tests passed
-# $fail_cnt   - number of tests failed
-# $ignore_cnt - number of tests ignored
-# $elapsed    - total time spent tesing
-#
-gen_report_summary() {
-    dst=$1
-    echo "<h2>Summary</h2>" > $dst
-    echo "<table cellspacing=\"2\" cellpadding=\"5\" border=\"0\">" >> $dst
-    echo "<tr>" >> $dst
-    echo "<th align=\"left\" $top_color>Tests</th>" >> $dst
-    echo "<th align=\"left\" $top_color>Pass</th>" >> $dst
-    echo "<th align=\"left\" $top_color>Fail</th>" >> $dst
-    echo "<th align=\"left\" $top_color>Ignore</th>" >> $dst
-    echo "<th align=\"left\" $top_color>Time (s)</th>" >> $dst
-    echo "</tr>" >> $dst
-    echo "<tr>" >> $dst
-    echo "<td align=\"right\" $row_color>$test_cnt</td>" >> $dst
-    echo "<td align=\"right\" $row_color>$pass_cnt</td>" >> $dst
-    echo "<td align=\"right\" $row_color>$fail_cnt</td>" >> $dst
-    echo "<td align=\"right\" $row_color>$ignore_cnt</td>" >> $dst
-    echo "<td align=\"right\" $row_color>$elapsed</td>" >> $dst
-    echo "</tr>" >> $dst
-    echo "</table>" >> $dst
-}
-
-gen_report_summary_json() {
-    dst=$1
-    echo "\"summary\": {" >> $dst
-    echo "\"total\": $test_cnt," >> $dst
-    echo "\"pass\": $pass_cnt," >> $dst
-    echo "\"fail\": $fail_cnt," >> $dst
-    echo "\"ignore\": $ignore_cnt," >> $dst
-    echo "\"time\": $elapsed" >> $dst
-    echo "}" >> $dst
-}
-
-get_file_size () {
-	if [ `uname` = FreeBSD ]; then
-	    stat -f "%z" "$1"
-	    return 0
-	fi
-	if [ `uname` = Linux ]; then
-	    stat -c "%s" "$1"
-	    return 0
-	fi
-	ls -l "$1" | awk '{print $5}'
-}
-
-#
-# Generate test file list
-# $1 - output file
-# $test_name - test name
-# $test_path - path to test
-# $test_cnt  - total number of tests (so far)
-#
-gen_file_list() {
-    dst=$1
-    echo "<html>" > $dst
-    echo "<title>File List for $test_name</title>" >> $dst
-    echo "<body bgcolor=\"#ffffff\">" >> $dst
-    echo "<h1>File List for $test_name</h1>" >> $dst
-    echo "<table cellspacing=\"2\" cellpadding=\"5\" border=\"0\">" >> $dst
-    echo "<tr>" >> $dst
-    echo "<th align=\"left\" $top_color>Filename</th>" >> $dst
-    echo "<th align=\"left\" $top_color>Size (bytes)</th>" >> $dst
-    echo "</tr>" >> $dst
-    filelist=`cat $test_path/FILES`
-    for file in $filelist; do
-	file_link=test.$test_cnt.$test_name.file.$file.txt
-	file_link=`echo "$file_link" | sed -e "s=/=.=g"`
-	echo "<tr>" >> $dst
-	if [ -f $test_path/$file ]; then
-	    cp $test_path/$file $file_link
-	    file_size=`get_file_size $file_link`
-	    echo "<td $row_color><a href=\"$file_link\">$file</a></td>" >> $dst
-	    echo "<td align=\"right\" $row_color>$file_size</td>" >> $dst
-	else
-	    echo "<td $row_color>$file</td>" >> $dst
-	    echo "<td align=\"right\" $row_color>not found</td>" >> $dst
-	fi
-	echo "</tr>" >> $dst
-    done
-    echo "</table>" >> $dst
-    echo "</body>" >> $dst
-    echo "</html>" >> $dst
-}
-
-#
-# Run one test
-#
-run_one_test() {
-    test=$1
-    test_cnt=$2
-    test_name=$3
-    test_path=$4
-    test_log=$5
-    test_result=$6
-    negate=$7
-    ignore=$8
-
-    rm -f tmp.$test_name.log-control
-    export VESPA_LOG_CONTROL_FILE=`pwd`/tmp.$test_name.log-control
-    # run test
-    local starttime=`date +%s`
-    /usr/bin/time -o tmp.${test}-time sh -c \
-	"(cd $test_path && $MAKE -s test $makeargs) > $test_log 2>&1"
-    result=$?
-    local endtime=`date +%s`
-    test_run_time=$(($endtime - $starttime))
-
-    #If you have run with valgrind check errors
-   if [ $result -eq 0 ]; then
-       valgrind_errors=`grep "ERROR SUMMARY" $test_log | cut -d ' ' -f4`
-       for r in $valgrind_errors
-       do
-           result=$(($result + $r))
-       done
-   fi
-
-    # handle test description
-    if [ -f $test_path/DESC ]; then
-	test_desc=test.$test_cnt.$test_name.desc.file.txt
-	cp $test_path/DESC $test_desc
-    else
-	test_desc="false"
-    fi
-
-    # handle test file list
-    if [ -f $test_path/FILES ]; then
-	test_files=test.$test_cnt.$test_name.files.html
-	gen_file_list $test_files
-    else
-	test_files="false"
-    fi
-
-    # handle test result negation
-    if $negate; then
-	if [ $result -eq 0 ]; then
-	    result=1
-	else
-	    result=0
-	fi
-    fi
-    result_string=""
-    if [ $result -eq 0 ]; then
-	if $ignore; then
-	    result_string="PASS (ignored)"
-	else
-	    result_string="PASS"
-	fi
-    else
-	if $ignore; then
-	    result_string="FAIL (ignored)"
-	else
-	    result_string="FAIL"
-	fi
-    fi
-
-    test_time=`cat tmp.${test}-time`
-    echo $test_name : $result_string
-    echo $result > $test_result
-    gen_report_entry $report.entry
-    gen_report_entry_json tmp.report.$test_name.json
-}
-
-progname=`basename $0 .sh`
-parallell=1
-if [ $progname = "testrun_sequential" ]; then
-    parallell=0
-fi
-
-if [ $# -lt 3 ]; then
-	echo "usage: $0 <rundir> <testlist> <top> [makeargs]"
-	echo "  rundir: where to run and generate output"
-	echo "  testlist: file with test names (relative to rundir)"
-	echo "  top: path to top (relative to rundir)"
-	exit 1
-fi
-
-makeargs=""
-if [ $# -eq 4 ]; then
-	makeargs=$4
-fi
-echo $makeargs
-
-mkdir -p $1
-cd $1 || exit 1
-testlist=`cat $2` || exit 1
-top_path=$3
-
-: ${MAKE:=gmake}
-unset MAKELEVEL
-
-rm -f test-report.html
-rm -f test-report.html.top
-rm -f test-report.html.bottom
-rm -f test-report.html.entry
-rm -f test-report.html.summary
-rm -f tmp.start-time
-rm -f tmp.end-time
-rm -f tmp.test-time
-rm -f tmp.report.*.json
-rm -f test.*.*.files.html
-rm -f test.*.*.file.*
-rm -f test-report.json
-
-date +%s > tmp.start-time
-
-report=test-report.html
-jsonreport=test-report.json
-gen_report_top $report.top
-gen_report_top_json $jsonreport
-gen_report_entry_init $report.entry
-gen_report_entry_init_json $jsonreport
-
-test_cnt=0
-fail_cnt=0
-pass_cnt=0
-ignore_cnt=0
-
-for test in $testlist; do
-    test_cnt=$(($test_cnt + 1))
-
-    negate=false
-    ignore=false
-    case $test in
-	\!*) negate=true; prefix="[!]"; test=${test#!};;
-	\?*) ignore=true; prefix="[?]"; test=${test#?};;
-    esac
-    prefix=""
-    test_name="${prefix}"`echo $test | sed -e "s=^tests/==;s=/=.=g"`
-    test_path=$top_path/$test
-    test=`basename $test`
-    test_log=test.$test_cnt.$test_name.log.file.txt
-    test_result=test.$test_cnt.$test_name.result
-    # run test
-    echo -n "running test '$test_name' ... "
-
-    if [ $parallell -eq 1 ]; then
-        run_one_test $test $test_cnt $test_name $test_path $test_log $test_result $negate $ignore &
-        echo $!
-    else
-        run_one_test $test $test_cnt $test_name $test_path $test_log $test_result $negate $ignore
-    fi
-
-done
-
-wait
-
-test_cnt=0
-for test in $testlist; do
-    test_cnt=$(($test_cnt + 1))
-    negate=false
-    ignore=false
-    case $test in
-	\!*) negate=true; prefix="[!]"; test=${test#!};;
-	\?*) ignore=true; prefix="[?]"; test=${test#?};;
-    esac
-    prefix=""
-    test_name="${prefix}"`echo $test | sed -e "s=^tests/==;s=/=.=g"`
-    test=`basename $test`
-    test_result=test.$test_cnt.$test_name.result
-    read result < $test_result
-    if [ $result -eq 0 ]; then
-	if $ignore; then
-	    ignore_cnt=$(($ignore_cnt + 1))
-	else
-	    pass_cnt=$(($pass_cnt + 1))
-	fi
-    else
-	if $ignore; then
-	    ignore_cnt=$(($ignore_cnt + 1))
-	else
-	    fail_cnt=$(($fail_cnt + 1))
-            cat test.$test_cnt.$test_name.log.file.txt
-	fi
-    fi
-    # Unfortunately, the JSON format is a bit context sensitive, so we need to do the old comma-before-entry-except-first logic
-    if [ $test_cnt -gt 1 ]; then
-        echo "," >> $jsonreport
-    fi
-    test_report=tmp.report.$test_name.json
-    cat $test_report >> $jsonreport
-    rm -f $test_report
-    rm -f $test_result
-done
-
-date +%s > tmp.end-time
-elapsed=$((`cat tmp.end-time` - `cat tmp.start-time`))
-gen_report_entry_fini $report.entry
-gen_report_entry_fini_json $jsonreport
-gen_report_summary $report.summary
-gen_report_summary_json $jsonreport
-gen_report_bottom $report.bottom
-gen_report_bottom_json $jsonreport
-cat $report.top $report.summary $report.entry $report.bottom > $report
-
-echo "summary: test/pass/fail/ignore: $test_cnt/$pass_cnt/$fail_cnt/$ignore_cnt"
-if [ $fail_cnt -eq 0 ]; then
-    echo "SUCCESS"
-    exit 0
-else
-    echo "FAILURE"
-    exit 1
-fi
diff --git a/vsm/src/tests/create-test.sh b/vsm/src/tests/create-test.sh
deleted file mode 100644
index 6c683706180..00000000000
--- a/vsm/src/tests/create-test.sh
+++ /dev/null
@@ -1,72 +0,0 @@
-#!/bin/sh
-# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-
-gen_ignore_file() {
-    echo "generating '$1' ..."
-    echo ".depend"       > $1
-    echo "Makefile"     >> $1
-    echo "${test}_test" >> $1
-}
-
-gen_project_file() {
-    echo "generating '$1' ..."
-    echo "APPLICATION ${test}_test"                                          > $1
-    echo "OBJS $test"                                                       >> $1
-    echo "LIBS vsm/vsm"                                                     >> $1
-    echo "EXTERNALLIBS vespalib vespalog"                                   >> $1
-    echo ""                                                                 >> $1
-    echo "CUSTOMMAKE"                                                       >> $1
-    echo "test: depend ${test}_test"                                        >> $1
-    echo -e "\t@./${test}_test"                                             >> $1
-}
-
-gen_source() {
-    echo "generating '$1' ..."
-    echo "#include <vespa/log/log.h>"                   > $1
-    echo "LOG_SETUP(\"${test}_test\");"          >> $1
-    echo "#include <vespa/vespalib/testkit/testapp.h>" >> $1
-    echo ""                                      >> $1
-    echo "// using namespace ;"                  >> $1
-    echo ""                                      >> $1
-    echo "TEST_SETUP(Test);"                     >> $1
-    echo ""                                      >> $1
-    echo "int"                                   >> $1
-    echo "Test::Main()"                          >> $1
-    echo "{"                                     >> $1
-    echo "    TEST_INIT(\"${test}_test\");"      >> $1
-    echo "    TEST_DONE();"                      >> $1
-    echo "}"                                     >> $1
-}
-
-gen_desc() {
-    echo "generating '$1' ..."
-    echo "$test test. Take a look at $test.cpp for details." > $1
-}
-
-gen_file_list() {
-    echo "generating '$1' ..."
-    echo "$test.cpp" > $1
-}
-
-if [ $# -ne 1 ]; then
-	echo "usage: $0 <name>"
-	echo "  name: name of the test to create"
-	exit 1
-fi
-
-test=$1
-if [ -e $test ]; then
-    echo "$test already present, don't want to mess it up..."
-    exit 1
-fi
-
-echo "creating directory '$test' ..."
-mkdir -p $test || exit 1
-cd $test || exit 1
-test=`basename $test`
-
-gen_ignore_file  .cvsignore
-gen_project_file fastos.project
-gen_source       $test.cpp
-gen_desc         DESC
-gen_file_list    FILES