diff --git a/obn-run-tests.sh b/obn-run-tests.sh
index fa1d728f373bbc133344fd14886982b2cdb21fe1..8db6f37b203c5a6c9733df4dc90f79b6dc0f8e2e 100755 (executable)
--- a/obn-run-tests.sh
+++ b/obn-run-tests.sh
set -e
+TEST_DIR=tests
+
# Тест: компиляция и исполнение
maketest()
{
local OK=1
local LOG=""
- if ! LOG="$(./obn-compile.sh $1)"; then
+ if ! LOG="$(./obn-compile.sh -I $TEST_DIR $1)"; then
OK=0;
echo "=============================="
echo "Test fail: $1 compile-time $?:"
if [ $OK = 1 ]; then
if ! ./obn-run.sh $1; then
OK=0
- echo "=============================="
- echo "Test fail: $1 run-time $?:"
- echo "$LOG"
- echo "=============================="
- echo
fi
fi
if [ $OK = 1 ]; then
makecomp()
{
local LOG=""
- if ! LOG="$(./obn-compile.sh $1)"; then
+ if ! LOG="$(./obn-compile.sh -I $TEST_DIR $1)"; then
echo "=============================="
echo "Test fail: $1 compile-time $?:"
echo "$LOG"
makefail()
{
local LOG=""
- if ! LOG="$(./obn-compile.sh $1)"; then
+ if ! LOG="$(./obn-compile.sh -I $TEST_DIR $1)"; then
echo "Test ok: $1"
else
echo "=============================="
maketest Test19
maketest Test20
+maketest Test21
+maketest Test22
+
+makecomp Test23A
+makefail Test23B
+
+maketest Test24
+maketest Test25
+maketest Test26
+maketest Test27
+maketest Test28