diff --git a/.gitignore b/.gitignore index 20dd87f..b206adc 100644 --- a/.gitignore +++ b/.gitignore @@ -13,33 +13,33 @@ autom4te.cache /configure /libtool /doc/xsl/catalog.xml -/sysbench/.deps -/sysbench/.libs -/sysbench/sysbench -/sysbench/drivers/mysql/.deps -/sysbench/drivers/oracle/.deps -/sysbench/drivers/pgsql/.deps -/sysbench/tests/cpu/.deps -/sysbench/tests/fileio/.deps -/sysbench/tests/memory/.deps -/sysbench/tests/mutex/.deps -/sysbench/tests/oltp/.deps -/sysbench/tests/threads/.deps +/src/.deps +/src/.libs +/src/sysbench +/src/drivers/mysql/.deps +/src/drivers/oracle/.deps +/src/drivers/pgsql/.deps +/src/tests/cpu/.deps +/src/tests/fileio/.deps +/src/tests/memory/.deps +/src/tests/mutex/.deps +/src/tests/oltp/.deps +/src/tests/threads/.deps /TAGS /backup.bzr /config/config.guess /config/config.h.in /config/config.sub -/sysbench/TAGS -/sysbench/drivers/TAGS -/sysbench/drivers/mysql/TAGS -/sysbench/tests/TAGS -/sysbench/tests/cpu/TAGS -/sysbench/tests/fileio/TAGS -/sysbench/tests/memory/TAGS -/sysbench/tests/mutex/TAGS -/sysbench/tests/oltp/TAGS -/sysbench/tests/threads/TAGS +/src/TAGS +/src/drivers/TAGS +/src/drivers/mysql/TAGS +/src/tests/TAGS +/src/tests/cpu/TAGS +/src/tests/fileio/TAGS +/src/tests/memory/TAGS +/src/tests/mutex/TAGS +/src/tests/oltp/TAGS +/src/tests/threads/TAGS /config/compile /config/depcomp /config/install-sh @@ -49,14 +49,14 @@ autom4te.cache /m4/ltsugar.m4 /m4/ltversion.m4 /m4/lt~obsolete.m4 -/sysbench/drivers/drizzle/.deps -/sysbench/scripting/.deps -/sysbench/scripting/lua/src/.deps +/src/drivers/drizzle/.deps +/src/scripting/.deps +/src/scripting/lua/src/.deps GPATH GRTAGS GTAGS /config/ar-lib -/sysbench/drivers/attachsql/.deps/ +/src/drivers/attachsql/.deps/ /config/test-driver *.DS_Store /tests/*.log @@ -73,10 +73,10 @@ third_party/luajit/inc/ third_party/luajit/lib/ third_party/luajit/share/ third_party/luajit/tmp/ -sysbench/lua/internal/sysbench.lua.h -sysbench/lua/internal/sysbench.sql.lua.h -/sysbench/lua/internal/sysbench.rand.lua.h -/sysbench/lua/internal/sysbench.opt.lua.h +src/lua/internal/sysbench.lua.h +src/lua/internal/sysbench.sql.lua.h +/src/lua/internal/sysbench.rand.lua.h +/src/lua/internal/sysbench.opt.lua.h tests/t/*.err -/sysbench/lua/internal/sysbench.cmdline.lua.h -/sysbench/lua/internal/sysbench.compat.lua.h +/src/lua/internal/sysbench.cmdline.lua.h +/src/lua/internal/sysbench.compat.lua.h diff --git a/Makefile.am b/Makefile.am index 9ddcf84..d74310a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -26,7 +26,7 @@ if USE_BUNDLED_CK CK_DIR = third_party/concurrency_kit endif -SUBDIRS = doc $(LUAJIT_DIR) $(CK_DIR) sysbench tests +SUBDIRS = doc $(LUAJIT_DIR) $(CK_DIR) src tests EXTRA_DIST = autogen.sh README.md README-WIN.txt README-Oracle.md ChangeLog diff --git a/configure.ac b/configure.ac index edff54a..6d6c3cc 100644 --- a/configure.ac +++ b/configure.ac @@ -15,7 +15,7 @@ CFLAGS=${SAVE_CFLAGS} CXXFLAGS=${SAVE_CXXFLAGS} AM_INIT_AUTOMAKE([-Wall -Werror foreign]) -AC_CONFIG_SRCDIR([sysbench/sysbench.c]) +AC_CONFIG_SRCDIR([src/sysbench.c]) AC_CONFIG_HEADER([config/config.h]) AC_CONFIG_MACRO_DIR([m4]) @@ -521,8 +521,7 @@ fi AM_CFLAGS="${CC_WARNINGS} ${GPROF_PROFILING} ${GPROF_COVERAGE} ${AM_CFLAGS} ${PTHREAD_CFLAGS}" -AM_CPPFLAGS="${AM_CPPFLAGS} -I\$(top_srcdir)/sysbench ${LUAJIT_CFLAGS} \ -${CK_CFLAGS}" +AM_CPPFLAGS="${AM_CPPFLAGS} -I\$(top_srcdir)/src ${LUAJIT_CFLAGS} ${CK_CFLAGS}" AM_LDFLAGS="$PTHREAD_LIBS" @@ -550,21 +549,21 @@ doc/xsl/catalog.xml doc/Makefile third_party/luajit/Makefile third_party/concurrency_kit/Makefile -sysbench/Makefile -sysbench/drivers/Makefile -sysbench/drivers/mysql/Makefile -sysbench/drivers/drizzle/Makefile -sysbench/drivers/oracle/Makefile -sysbench/drivers/pgsql/Makefile -sysbench/drivers/attachsql/Makefile -sysbench/tests/Makefile -sysbench/tests/cpu/Makefile -sysbench/tests/fileio/Makefile -sysbench/tests/memory/Makefile -sysbench/tests/threads/Makefile -sysbench/tests/mutex/Makefile -sysbench/lua/Makefile -sysbench/lua/internal/Makefile +src/Makefile +src/drivers/Makefile +src/drivers/mysql/Makefile +src/drivers/drizzle/Makefile +src/drivers/oracle/Makefile +src/drivers/pgsql/Makefile +src/drivers/attachsql/Makefile +src/tests/Makefile +src/tests/cpu/Makefile +src/tests/fileio/Makefile +src/tests/memory/Makefile +src/tests/threads/Makefile +src/tests/mutex/Makefile +src/lua/Makefile +src/lua/internal/Makefile tests/Makefile tests/include/config.sh ]) diff --git a/sysbench/CMakeLists.txt b/src/CMakeLists.txt similarity index 100% rename from sysbench/CMakeLists.txt rename to src/CMakeLists.txt diff --git a/sysbench/Makefile.am b/src/Makefile.am similarity index 100% rename from sysbench/Makefile.am rename to src/Makefile.am diff --git a/sysbench/db_driver.c b/src/db_driver.c similarity index 100% rename from sysbench/db_driver.c rename to src/db_driver.c diff --git a/sysbench/db_driver.h b/src/db_driver.h similarity index 100% rename from sysbench/db_driver.h rename to src/db_driver.h diff --git a/sysbench/drivers/Makefile.am b/src/drivers/Makefile.am similarity index 100% rename from sysbench/drivers/Makefile.am rename to src/drivers/Makefile.am diff --git a/sysbench/drivers/attachsql/Makefile.am b/src/drivers/attachsql/Makefile.am similarity index 100% rename from sysbench/drivers/attachsql/Makefile.am rename to src/drivers/attachsql/Makefile.am diff --git a/sysbench/drivers/attachsql/drv_attachsql.c b/src/drivers/attachsql/drv_attachsql.c similarity index 100% rename from sysbench/drivers/attachsql/drv_attachsql.c rename to src/drivers/attachsql/drv_attachsql.c diff --git a/sysbench/drivers/drizzle/Makefile.am b/src/drivers/drizzle/Makefile.am similarity index 100% rename from sysbench/drivers/drizzle/Makefile.am rename to src/drivers/drizzle/Makefile.am diff --git a/sysbench/drivers/drizzle/drv_drizzle.c b/src/drivers/drizzle/drv_drizzle.c similarity index 100% rename from sysbench/drivers/drizzle/drv_drizzle.c rename to src/drivers/drizzle/drv_drizzle.c diff --git a/sysbench/drivers/mysql/CMakeLists.txt b/src/drivers/mysql/CMakeLists.txt similarity index 100% rename from sysbench/drivers/mysql/CMakeLists.txt rename to src/drivers/mysql/CMakeLists.txt diff --git a/sysbench/drivers/mysql/Makefile.am b/src/drivers/mysql/Makefile.am similarity index 100% rename from sysbench/drivers/mysql/Makefile.am rename to src/drivers/mysql/Makefile.am diff --git a/sysbench/drivers/mysql/drv_mysql.c b/src/drivers/mysql/drv_mysql.c similarity index 100% rename from sysbench/drivers/mysql/drv_mysql.c rename to src/drivers/mysql/drv_mysql.c diff --git a/sysbench/drivers/oracle/Makefile.am b/src/drivers/oracle/Makefile.am similarity index 100% rename from sysbench/drivers/oracle/Makefile.am rename to src/drivers/oracle/Makefile.am diff --git a/sysbench/drivers/oracle/drv_oracle.c b/src/drivers/oracle/drv_oracle.c similarity index 100% rename from sysbench/drivers/oracle/drv_oracle.c rename to src/drivers/oracle/drv_oracle.c diff --git a/sysbench/drivers/pgsql/Makefile.am b/src/drivers/pgsql/Makefile.am similarity index 100% rename from sysbench/drivers/pgsql/Makefile.am rename to src/drivers/pgsql/Makefile.am diff --git a/sysbench/drivers/pgsql/drv_pgsql.c b/src/drivers/pgsql/drv_pgsql.c similarity index 100% rename from sysbench/drivers/pgsql/drv_pgsql.c rename to src/drivers/pgsql/drv_pgsql.c diff --git a/sysbench/lua/Makefile.am b/src/lua/Makefile.am similarity index 100% rename from sysbench/lua/Makefile.am rename to src/lua/Makefile.am diff --git a/sysbench/lua/bulk_insert.lua b/src/lua/bulk_insert.lua similarity index 100% rename from sysbench/lua/bulk_insert.lua rename to src/lua/bulk_insert.lua diff --git a/sysbench/lua/internal/Makefile.am b/src/lua/internal/Makefile.am similarity index 100% rename from sysbench/lua/internal/Makefile.am rename to src/lua/internal/Makefile.am diff --git a/sysbench/lua/internal/sysbench.cmdline.lua b/src/lua/internal/sysbench.cmdline.lua similarity index 100% rename from sysbench/lua/internal/sysbench.cmdline.lua rename to src/lua/internal/sysbench.cmdline.lua diff --git a/sysbench/lua/internal/sysbench.compat.lua b/src/lua/internal/sysbench.compat.lua similarity index 100% rename from sysbench/lua/internal/sysbench.compat.lua rename to src/lua/internal/sysbench.compat.lua diff --git a/sysbench/lua/internal/sysbench.lua b/src/lua/internal/sysbench.lua similarity index 100% rename from sysbench/lua/internal/sysbench.lua rename to src/lua/internal/sysbench.lua diff --git a/sysbench/lua/internal/sysbench.rand.lua b/src/lua/internal/sysbench.rand.lua similarity index 100% rename from sysbench/lua/internal/sysbench.rand.lua rename to src/lua/internal/sysbench.rand.lua diff --git a/sysbench/lua/internal/sysbench.sql.lua b/src/lua/internal/sysbench.sql.lua similarity index 100% rename from sysbench/lua/internal/sysbench.sql.lua rename to src/lua/internal/sysbench.sql.lua diff --git a/sysbench/lua/oltp_common.lua b/src/lua/oltp_common.lua similarity index 100% rename from sysbench/lua/oltp_common.lua rename to src/lua/oltp_common.lua diff --git a/sysbench/lua/oltp_delete.lua b/src/lua/oltp_delete.lua similarity index 100% rename from sysbench/lua/oltp_delete.lua rename to src/lua/oltp_delete.lua diff --git a/sysbench/lua/oltp_insert.lua b/src/lua/oltp_insert.lua similarity index 100% rename from sysbench/lua/oltp_insert.lua rename to src/lua/oltp_insert.lua diff --git a/sysbench/lua/oltp_point_select.lua b/src/lua/oltp_point_select.lua similarity index 100% rename from sysbench/lua/oltp_point_select.lua rename to src/lua/oltp_point_select.lua diff --git a/sysbench/lua/oltp_read_only.lua b/src/lua/oltp_read_only.lua similarity index 100% rename from sysbench/lua/oltp_read_only.lua rename to src/lua/oltp_read_only.lua diff --git a/sysbench/lua/oltp_read_write.lua b/src/lua/oltp_read_write.lua similarity index 100% rename from sysbench/lua/oltp_read_write.lua rename to src/lua/oltp_read_write.lua diff --git a/sysbench/lua/oltp_update_index.lua b/src/lua/oltp_update_index.lua similarity index 100% rename from sysbench/lua/oltp_update_index.lua rename to src/lua/oltp_update_index.lua diff --git a/sysbench/lua/oltp_update_non_index.lua b/src/lua/oltp_update_non_index.lua similarity index 100% rename from sysbench/lua/oltp_update_non_index.lua rename to src/lua/oltp_update_non_index.lua diff --git a/sysbench/lua/oltp_write_only.lua b/src/lua/oltp_write_only.lua similarity index 100% rename from sysbench/lua/oltp_write_only.lua rename to src/lua/oltp_write_only.lua diff --git a/sysbench/lua/select_random_points.lua b/src/lua/select_random_points.lua similarity index 100% rename from sysbench/lua/select_random_points.lua rename to src/lua/select_random_points.lua diff --git a/sysbench/lua/select_random_ranges.lua b/src/lua/select_random_ranges.lua similarity index 100% rename from sysbench/lua/select_random_ranges.lua rename to src/lua/select_random_ranges.lua diff --git a/sysbench/sb_barrier.c b/src/sb_barrier.c similarity index 100% rename from sysbench/sb_barrier.c rename to src/sb_barrier.c diff --git a/sysbench/sb_barrier.h b/src/sb_barrier.h similarity index 100% rename from sysbench/sb_barrier.h rename to src/sb_barrier.h diff --git a/sysbench/sb_global.h b/src/sb_global.h similarity index 100% rename from sysbench/sb_global.h rename to src/sb_global.h diff --git a/sysbench/sb_histogram.c b/src/sb_histogram.c similarity index 100% rename from sysbench/sb_histogram.c rename to src/sb_histogram.c diff --git a/sysbench/sb_histogram.h b/src/sb_histogram.h similarity index 100% rename from sysbench/sb_histogram.h rename to src/sb_histogram.h diff --git a/sysbench/sb_list.h b/src/sb_list.h similarity index 100% rename from sysbench/sb_list.h rename to src/sb_list.h diff --git a/sysbench/sb_logger.c b/src/sb_logger.c similarity index 100% rename from sysbench/sb_logger.c rename to src/sb_logger.c diff --git a/sysbench/sb_logger.h b/src/sb_logger.h similarity index 100% rename from sysbench/sb_logger.h rename to src/sb_logger.h diff --git a/sysbench/sb_lua.c b/src/sb_lua.c similarity index 99% rename from sysbench/sb_lua.c rename to src/sb_lua.c index 1aa9a54..dce89e3 100644 --- a/sysbench/sb_lua.c +++ b/src/sb_lua.c @@ -541,7 +541,7 @@ static void sb_lua_set_paths(lua_State *L) lua_pushliteral(L, "./?.lua;"); lua_pushliteral(L, "./?/init.lua;"); - lua_pushliteral(L, "./sysbench/lua/?.lua;"); + lua_pushliteral(L, "./src/lua/?.lua;"); const char *home = getenv("HOME"); if (home != NULL) diff --git a/sysbench/sb_lua.h b/src/sb_lua.h similarity index 100% rename from sysbench/sb_lua.h rename to src/sb_lua.h diff --git a/sysbench/sb_options.c b/src/sb_options.c similarity index 100% rename from sysbench/sb_options.c rename to src/sb_options.c diff --git a/sysbench/sb_options.h b/src/sb_options.h similarity index 100% rename from sysbench/sb_options.h rename to src/sb_options.h diff --git a/sysbench/sb_rand.c b/src/sb_rand.c similarity index 100% rename from sysbench/sb_rand.c rename to src/sb_rand.c diff --git a/sysbench/sb_rand.h b/src/sb_rand.h similarity index 100% rename from sysbench/sb_rand.h rename to src/sb_rand.h diff --git a/sysbench/sb_thread.c b/src/sb_thread.c similarity index 100% rename from sysbench/sb_thread.c rename to src/sb_thread.c diff --git a/sysbench/sb_thread.h b/src/sb_thread.h similarity index 100% rename from sysbench/sb_thread.h rename to src/sb_thread.h diff --git a/sysbench/sb_timer.c b/src/sb_timer.c similarity index 100% rename from sysbench/sb_timer.c rename to src/sb_timer.c diff --git a/sysbench/sb_timer.h b/src/sb_timer.h similarity index 100% rename from sysbench/sb_timer.h rename to src/sb_timer.h diff --git a/sysbench/sb_util.c b/src/sb_util.c similarity index 100% rename from sysbench/sb_util.c rename to src/sb_util.c diff --git a/sysbench/sb_util.h b/src/sb_util.h similarity index 100% rename from sysbench/sb_util.h rename to src/sb_util.h diff --git a/sysbench/sb_win.c b/src/sb_win.c similarity index 100% rename from sysbench/sb_win.c rename to src/sb_win.c diff --git a/sysbench/sb_win.h b/src/sb_win.h similarity index 100% rename from sysbench/sb_win.h rename to src/sb_win.h diff --git a/sysbench/sysbench.c b/src/sysbench.c similarity index 100% rename from sysbench/sysbench.c rename to src/sysbench.c diff --git a/sysbench/sysbench.h b/src/sysbench.h similarity index 100% rename from sysbench/sysbench.h rename to src/sysbench.h diff --git a/sysbench/tests/CMakeLists.txt b/src/tests/CMakeLists.txt similarity index 100% rename from sysbench/tests/CMakeLists.txt rename to src/tests/CMakeLists.txt diff --git a/sysbench/tests/Makefile.am b/src/tests/Makefile.am similarity index 100% rename from sysbench/tests/Makefile.am rename to src/tests/Makefile.am diff --git a/sysbench/tests/cpu/CMakeLists.txt b/src/tests/cpu/CMakeLists.txt similarity index 100% rename from sysbench/tests/cpu/CMakeLists.txt rename to src/tests/cpu/CMakeLists.txt diff --git a/sysbench/tests/cpu/Makefile.am b/src/tests/cpu/Makefile.am similarity index 100% rename from sysbench/tests/cpu/Makefile.am rename to src/tests/cpu/Makefile.am diff --git a/sysbench/tests/cpu/sb_cpu.c b/src/tests/cpu/sb_cpu.c similarity index 100% rename from sysbench/tests/cpu/sb_cpu.c rename to src/tests/cpu/sb_cpu.c diff --git a/sysbench/tests/fileio/CMakeLists.txt b/src/tests/fileio/CMakeLists.txt similarity index 100% rename from sysbench/tests/fileio/CMakeLists.txt rename to src/tests/fileio/CMakeLists.txt diff --git a/sysbench/tests/fileio/Makefile.am b/src/tests/fileio/Makefile.am similarity index 100% rename from sysbench/tests/fileio/Makefile.am rename to src/tests/fileio/Makefile.am diff --git a/sysbench/tests/fileio/crc32.c b/src/tests/fileio/crc32.c similarity index 100% rename from sysbench/tests/fileio/crc32.c rename to src/tests/fileio/crc32.c diff --git a/sysbench/tests/fileio/crc32.h b/src/tests/fileio/crc32.h similarity index 100% rename from sysbench/tests/fileio/crc32.h rename to src/tests/fileio/crc32.h diff --git a/sysbench/tests/fileio/crc32tbl.h b/src/tests/fileio/crc32tbl.h similarity index 100% rename from sysbench/tests/fileio/crc32tbl.h rename to src/tests/fileio/crc32tbl.h diff --git a/sysbench/tests/fileio/sb_fileio.c b/src/tests/fileio/sb_fileio.c similarity index 100% rename from sysbench/tests/fileio/sb_fileio.c rename to src/tests/fileio/sb_fileio.c diff --git a/sysbench/tests/memory/CMakeLists.txt b/src/tests/memory/CMakeLists.txt similarity index 100% rename from sysbench/tests/memory/CMakeLists.txt rename to src/tests/memory/CMakeLists.txt diff --git a/sysbench/tests/memory/Makefile.am b/src/tests/memory/Makefile.am similarity index 100% rename from sysbench/tests/memory/Makefile.am rename to src/tests/memory/Makefile.am diff --git a/sysbench/tests/memory/sb_memory.c b/src/tests/memory/sb_memory.c similarity index 100% rename from sysbench/tests/memory/sb_memory.c rename to src/tests/memory/sb_memory.c diff --git a/sysbench/tests/mutex/CMakeLists.txt b/src/tests/mutex/CMakeLists.txt similarity index 100% rename from sysbench/tests/mutex/CMakeLists.txt rename to src/tests/mutex/CMakeLists.txt diff --git a/sysbench/tests/mutex/Makefile.am b/src/tests/mutex/Makefile.am similarity index 100% rename from sysbench/tests/mutex/Makefile.am rename to src/tests/mutex/Makefile.am diff --git a/sysbench/tests/mutex/sb_mutex.c b/src/tests/mutex/sb_mutex.c similarity index 100% rename from sysbench/tests/mutex/sb_mutex.c rename to src/tests/mutex/sb_mutex.c diff --git a/sysbench/tests/sb_cpu.h b/src/tests/sb_cpu.h similarity index 100% rename from sysbench/tests/sb_cpu.h rename to src/tests/sb_cpu.h diff --git a/sysbench/tests/sb_fileio.h b/src/tests/sb_fileio.h similarity index 100% rename from sysbench/tests/sb_fileio.h rename to src/tests/sb_fileio.h diff --git a/sysbench/tests/sb_memory.h b/src/tests/sb_memory.h similarity index 100% rename from sysbench/tests/sb_memory.h rename to src/tests/sb_memory.h diff --git a/sysbench/tests/sb_mutex.h b/src/tests/sb_mutex.h similarity index 100% rename from sysbench/tests/sb_mutex.h rename to src/tests/sb_mutex.h diff --git a/sysbench/tests/sb_threads.h b/src/tests/sb_threads.h similarity index 100% rename from sysbench/tests/sb_threads.h rename to src/tests/sb_threads.h diff --git a/sysbench/tests/threads/CMakeLists.txt b/src/tests/threads/CMakeLists.txt similarity index 100% rename from sysbench/tests/threads/CMakeLists.txt rename to src/tests/threads/CMakeLists.txt diff --git a/sysbench/tests/threads/Makefile.am b/src/tests/threads/Makefile.am similarity index 100% rename from sysbench/tests/threads/Makefile.am rename to src/tests/threads/Makefile.am diff --git a/sysbench/tests/threads/sb_threads.c b/src/tests/threads/sb_threads.c similarity index 100% rename from sysbench/tests/threads/sb_threads.c rename to src/tests/threads/sb_threads.c diff --git a/sysbench/xoroshiro128plus.h b/src/xoroshiro128plus.h similarity index 100% rename from sysbench/xoroshiro128plus.h rename to src/xoroshiro128plus.h diff --git a/tests/test_run.sh b/tests/test_run.sh index cd5c9f3..86718ee 100755 --- a/tests/test_run.sh +++ b/tests/test_run.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -# Copyright (C) 2016 Alexey Kopytov +# Copyright (C) 2016-2017 Alexey Kopytov # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -21,35 +21,26 @@ set -eu testroot=$(cd $(dirname "$0"); echo $PWD) # Find the sysbench binary to use -if [ -x "$testroot/../sysbench/sysbench" ] -then - # Invoked from a source directory? - PATH="$testroot/../sysbench:$PATH" -elif [ -x "$testroot/../bin" ] -then - # Invoked from a standalone install root directory? - PATH="$testroot/../bin:$PATH" -elif [ -x "$testroot/../../../bin/sysbench" ] -then - # Invoked from a system-wide install (e.g. /usr/local/share/sysbench/tests)? - PATH="$testroot/../../../bin:$PATH" -elif [ -x "$PWD/../sysbench/sysbench" ] -then - # Invoked from the build directory by 'make distcheck'? - PATH="$PWD/../sysbench:$PATH" -fi +dirlist=( "$testroot/../src" # source directory + "$testroot/../bin" # standalone install root directory + "$testroot/../../../bin" # system-wide install (e.g. /usr/local/share/sysbench/tests) + "$PWD/../src" ) # build directory by 'make distcheck' -if ! which sysbench >/dev/null 2>&1 +for dir in ${dirlist[@]} +do + if [ -x "$dir/sysbench" ] + then + sysbench_dir="$dir" + fi +done + +if [ -z ${sysbench_dir+x} ] then - echo "Cannot find sysbench in PATH=$PATH" - echo "testroot=$testroot" - echo "PWD=$PWD" - ls -l $PWD - ls -l $PWD/../sysbench - ls -l $testroot - ls -l $testroot/.. - ls -l $testroot/../sysbench + echo "Cannot find sysbench in the following list of directories: \ +${dirlist[@]}" exit 1 +else + PATH="${sysbench_dir}:$PATH" fi if [ -z ${srcdir+x} ] @@ -77,7 +68,7 @@ then fi export SBTEST_ROOTDIR="$testroot" -export SBTEST_SCRIPTDIR="$testroot/../sysbench/lua" +export SBTEST_SCRIPTDIR="$testroot/../src/lua" export SBTEST_SUITEDIR="$testroot/t" export SBTEST_CONFIG export SBTEST_INCDIR