diff options
author | Jani Honkonen <jani.honkonen@digia.com> | 2012-05-22 10:25:17 +0300 |
---|---|---|
committer | Jani Honkonen <jani.honkonen@digia.com> | 2012-05-22 10:25:17 +0300 |
commit | 5bd91523463d08b26e185d494707a61b9ede838c (patch) | |
tree | 8b557203df87a43590e5020739a094656a7e4980 | |
parent | d898436e4875e009f1b67c3aa054e69b322a0931 (diff) |
Move scripts to tools folder
-rw-r--r-- | tests/scripts/execute_tst.perl | 42 | ||||
-rw-r--r-- | tools/Jobs.pm (renamed from tests/scripts/Jobs.pm) | 0 | ||||
-rw-r--r-- | tools/Tiny.pm (renamed from tests/scripts/Tiny.pm) | 0 | ||||
-rw-r--r-- | tools/build.pl (renamed from tests/scripts/build.pl) | 2 | ||||
-rw-r--r-- | tools/build_win_mingw.bat (renamed from tests/scripts/build_win_mingw.bat) | 0 | ||||
-rw-r--r-- | tools/build_win_vs2005.bat (renamed from tests/scripts/build_win_vs2005.bat) | 0 | ||||
-rw-r--r-- | tools/build_win_vs2008.bat (renamed from tests/scripts/build_win_vs2008.bat) | 0 | ||||
-rw-r--r-- | tools/build_win_vs2010.bat (renamed from tests/scripts/build_win_vs2010.bat) | 0 | ||||
-rw-r--r-- | tools/build_win_vs2010_64bit.bat (renamed from tests/scripts/build_win_vs2010_64bit.bat) | 0 | ||||
-rw-r--r-- | tools/jobs.ini (renamed from tests/scripts/jobs.ini) | 0 | ||||
-rw-r--r-- | tools/run_tests.pl (renamed from tests/scripts/run_tests.pl) | 2 |
11 files changed, 2 insertions, 44 deletions
diff --git a/tests/scripts/execute_tst.perl b/tests/scripts/execute_tst.perl deleted file mode 100644 index bfc6d54c..00000000 --- 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 = <TESTAPPDIR>; -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 index e2021daf..e2021daf 100644 --- a/tests/scripts/Jobs.pm +++ b/tools/Jobs.pm diff --git a/tests/scripts/Tiny.pm b/tools/Tiny.pm index 24961295..24961295 100644 --- a/tests/scripts/Tiny.pm +++ b/tools/Tiny.pm diff --git a/tests/scripts/build.pl b/tools/build.pl index 31b228d1..3379db74 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 index 54212cd1..54212cd1 100644 --- a/tests/scripts/build_win_mingw.bat +++ b/tools/build_win_mingw.bat diff --git a/tests/scripts/build_win_vs2005.bat b/tools/build_win_vs2005.bat index 9642ba25..9642ba25 100644 --- a/tests/scripts/build_win_vs2005.bat +++ b/tools/build_win_vs2005.bat diff --git a/tests/scripts/build_win_vs2008.bat b/tools/build_win_vs2008.bat index 4edcefc2..4edcefc2 100644 --- a/tests/scripts/build_win_vs2008.bat +++ b/tools/build_win_vs2008.bat diff --git a/tests/scripts/build_win_vs2010.bat b/tools/build_win_vs2010.bat index 690dabf6..690dabf6 100644 --- a/tests/scripts/build_win_vs2010.bat +++ b/tools/build_win_vs2010.bat diff --git a/tests/scripts/build_win_vs2010_64bit.bat b/tools/build_win_vs2010_64bit.bat index e89af2c8..e89af2c8 100644 --- a/tests/scripts/build_win_vs2010_64bit.bat +++ b/tools/build_win_vs2010_64bit.bat diff --git a/tests/scripts/jobs.ini b/tools/jobs.ini index cbcaeeba..cbcaeeba 100644 --- a/tests/scripts/jobs.ini +++ b/tools/jobs.ini diff --git a/tests/scripts/run_tests.pl b/tools/run_tests.pl index d489b118..c0a34cd1 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 |