use run_test_other.sh for 5 C++ test suites

This will make things less error prone. If we fork early in the makefile instead of sharing some infra then changes to the PHP-based test infra won't break c++ tests.

While I was there, I tried to fix the weird order that some tests had
the suite first and some had the set first. It got hard since D773384 hasn't
landed yet. When we do that, then I'll cleanup that stuff.
Esse commit está contido em:
Paul Tarjan
2013-04-20 10:08:45 -07:00
commit de Sara Golemon
commit 91db25c8e1
2 arquivos alterados com 28 adições e 0 exclusões
+19
Ver Arquivo
@@ -0,0 +1,19 @@
#!/bin/env php
<?php
chdir(__DIR__.'/../../');
include_once __DIR__.'/fbmake_test_lib.php';
$cmd = "FBMAKE_BIN_ROOT=$argv[1] " .
"./hphp/tools/run_test_binary.sh '$argv[2]' '$argv[3]' '$argv[4]' ".
"2>/dev/null";
loop_tests($cmd, function ($line) {
if (preg_match('/^(Test[a-zA-Z]*)\.\.\.\.\.\.$/', $line, $m)) {
start($m[1]);
} else if (preg_match('/^Test[a-zA-Z]* (OK|\#\#\#\#\#\>\>\> FAILED)/',
$line,
$m)) {
finish($m[1] == 'OK' ? 'passed' : 'failed');
}
});
+9
Ver Arquivo
@@ -0,0 +1,9 @@
#!/bin/sh
#
# Helper for running TestExt from an fbmake build.
#
# ./run_test_ext.sh
#
HPHP_HOME=$(git rev-parse --show-toplevel)
: ${FBMAKE_BIN_ROOT=_bin}
cd $HPHP_HOME/hphp && $HPHP_HOME/$FBMAKE_BIN_ROOT/hphp/test/test "$1" "$2" "$3"