From 5bd91523463d08b26e185d494707a61b9ede838c 2012-05-22 07:25:17 From: Jani Honkonen Date: 2012-05-22 07:25:17 Subject: [PATCH] Move scripts to tools folder --- diff --git a/tests/scripts/execute_tst.perl b/tests/scripts/execute_tst.perl deleted file mode 100644 index bfc6d54..0000000 --- a/tests/scripts/execute_tst.perl +++ /dev/null @@ -1,42 +0,0 @@ -use Cwd; -use Cwd 'abs_path'; -use File::Basename; - -# Go through all the files in the test folder -my $root_path = abs_path(); -my $test_path = "$root_path/bin/test/"; -opendir (TESTAPPDIR, "$test_path") or die "Couldn't open test app dir"; -@files = ; -while ($testapp = readdir TESTAPPDIR) { - # autotest is an executable beginning with "tst_" - if (index($testapp, "tst_") == 0) { - if (-x "$test_path$testapp") { - my $cmd_postfix = ""; - if ($^O == "darwin") { - # On OSX the actual test binary is in a sub folder - $cmd_postfix = "/Contents/MacOS/$testapp"; - $cmd_postfix = substr($cmd_postfix, 0, rindex($cmd_postfix, ".app")); - } - # Generate path for test results - my $test_result_path = "test-reports/$testapp.xml"; - mkdir dirname($test_result_path); - # Execute the actual auto test - executeTestApp("$test_path$testapp$cmd_postfix", "-xunitxml -o $test_result_path"); - } else { - print "file $tst_executable not executable"; - } - } -} -closedir TESTAPPDIR; - -sub executeTestApp($) { - my $test_app_path = $_[0]; - my $parameters = $_[1]; - - print "executing: $cmd_prefix$test_app_path $parameters\n"; - my $file_handle = system("$test_app_path $parameters"); - - my $exit_status = $? >> 8; -# print "exit: $exit_status \n"; -# print "handle: $file_handle\n"; -} diff --git a/tests/scripts/Jobs.pm b/tools/Jobs.pm similarity index 100% rename from tests/scripts/Jobs.pm rename to tools/Jobs.pm diff --git a/tests/scripts/Tiny.pm b/tools/Tiny.pm similarity index 100% rename from tests/scripts/Tiny.pm rename to tools/Tiny.pm diff --git a/tests/scripts/build.pl b/tools/build.pl similarity index 98% rename from tests/scripts/build.pl rename to tools/build.pl index 31b228d..3379db7 100644 --- a/tests/scripts/build.pl +++ b/tools/build.pl @@ -1,6 +1,6 @@ use File::Basename; use feature "switch"; -use lib 'test/scripts'; +use lib 'tools'; use Jobs; # read command line params diff --git a/tests/scripts/build_win_mingw.bat b/tools/build_win_mingw.bat similarity index 100% rename from tests/scripts/build_win_mingw.bat rename to tools/build_win_mingw.bat diff --git a/tests/scripts/build_win_vs2005.bat b/tools/build_win_vs2005.bat similarity index 100% rename from tests/scripts/build_win_vs2005.bat rename to tools/build_win_vs2005.bat diff --git a/tests/scripts/build_win_vs2008.bat b/tools/build_win_vs2008.bat similarity index 100% rename from tests/scripts/build_win_vs2008.bat rename to tools/build_win_vs2008.bat diff --git a/tests/scripts/build_win_vs2010.bat b/tools/build_win_vs2010.bat similarity index 100% rename from tests/scripts/build_win_vs2010.bat rename to tools/build_win_vs2010.bat diff --git a/tests/scripts/build_win_vs2010_64bit.bat b/tools/build_win_vs2010_64bit.bat similarity index 100% rename from tests/scripts/build_win_vs2010_64bit.bat rename to tools/build_win_vs2010_64bit.bat diff --git a/tests/scripts/jobs.ini b/tools/jobs.ini similarity index 100% rename from tests/scripts/jobs.ini rename to tools/jobs.ini diff --git a/tests/scripts/run_tests.pl b/tools/run_tests.pl similarity index 98% rename from tests/scripts/run_tests.pl rename to tools/run_tests.pl index d489b11..c0a34cd 100644 --- a/tests/scripts/run_tests.pl +++ b/tools/run_tests.pl @@ -3,7 +3,7 @@ use Cwd 'abs_path'; use File::Basename; use File::Copy; use feature "switch"; -use lib 'test/scripts'; +use lib 'tools'; use Jobs; # read command line params