Skip to content

Commit 9e4acbd

Browse files
committed
test: fix feature test on Windows
1 parent ffc2ee0 commit 9e4acbd

1 file changed

Lines changed: 6 additions & 6 deletions

File tree

tests/features/featuretest

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ FEATURETOOL=opp_featuretool
1010
# Set the SKIPPED_FEATURES environment variable to empty string to allow enabling
1111
# the features that require NSC or libav*.
1212
if [ -z ${SKIPPED_FEATURES+x} ]; then
13-
skipped_features="TcpNsc VoipStream"
13+
skipped_features="VoipStream"
1414
else
1515
skipped_features=${SKIPPED_FEATURES}
1616
fi
@@ -38,14 +38,14 @@ runtest() {
3838
GREEN='\033[0;32m'
3939
NC='\033[0m' # No Color
4040
(make makefiles >/dev/null && make cleanall >/dev/null && make makefiles >/dev/null) || { echo "*** $testindex. $1 prepare build: ${RED}FAIL${NC}" ; return 1; }
41-
make -j8 >/$LOG_DIR/$1-build.out 2>/$LOG_DIR/$1-build.err || { echo "*** $testindex. $1 building: ${RED}FAIL${NC}" ; return 1; }
42-
(cd $DIR; opp_run -l ../../src/INET -u Cmdenv -n ../../src:. >/$LOG_DIR/$1-run.out 2>/$LOG_DIR/$1-run.err) || { echo "*** $testindex. $1 running: ${RED}FAIL${NC}" ; return 1; }
41+
make -j8 >$LOG_DIR/$1-build.out 2>$LOG_DIR/$1-build.err || { echo "*** $testindex. $1 building: ${RED}FAIL${NC}" ; return 1; }
42+
(cd $DIR; opp_run -l ../../src/INET -u Cmdenv -n ../../src:. >$LOG_DIR/$1-run.out 2>$LOG_DIR/$1-run.err) || { echo "*** $testindex. $1 running: ${RED}FAIL${NC}" ; return 1; }
4343
echo "*** $testindex. $1: ${GREEN}PASS${NC}"; return 0;
4444
}
4545

46-
cd `dirname $0`
47-
DIR=`pwd`
48-
LOG_DIR=`pwd`/_log
46+
cd $(dirname $0)
47+
DIR=$(pwd)
48+
LOG_DIR=$(pwd)/_log
4949
rm -rf $LOG_DIR; mkdir -p $LOG_DIR
5050
cd ../..
5151

0 commit comments

Comments
 (0)