Skip to content

Commit

Permalink
moving netedit tests last to ensure wheels are being built #3
Browse files Browse the repository at this point in the history
  • Loading branch information
behrisch committed May 3, 2024
1 parent c8187c9 commit a861fc2
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions tools/build_config/dailyUpdateMakeGCC.sh
Original file line number Diff line number Diff line change
Expand Up @@ -125,14 +125,6 @@ basename $TESTLOG >> $STATUSLOG
date >> $STATUSLOG
echo "--" >> $STATUSLOG

# netedit tests
if test -e $SUMO_BINDIR/netedit -a $SUMO_BINDIR/netedit -nt build/$FILEPREFIX/Makefile; then
if test "$FILEPREFIX" == "gcc4_64"; then
tests/runNeteditDailyTests.sh -b ${FILEPREFIX}netedit -name $TESTLABEL >> $TESTLOG 2>&1
tests/runTests.sh -b ${FILEPREFIX} -name $TESTLABEL -coll >> $TESTLOG 2>&1
fi
fi

WHEELLOG=$PREFIX/${FILEPREFIX}wheel.log
rm -rf dist dist_native
# native macOS M1 wheels and Linux ARM
Expand All @@ -150,6 +142,14 @@ if test ${FILEPREFIX: -2} == "M1"; then
fi
# Linux x64 wheels
if test ${FILEPREFIX} == "gcc4_64"; then
docker run --rm -v $PWD:/opt/sumo --workdir /opt/sumo manylinux2014_x64 tools/build_config/build_wheels.sh $HTTPS_PROXY v1.0.6 > $WHEELLOG 2>&1
docker run --rm -v $PWD:/opt/sumo --workdir /opt/sumo manylinux2014_x64 tools/build_config/build_wheels.sh $HTTPS_PROXY v1.2.0 > $WHEELLOG 2>&1
cp build/$FILEPREFIX/*.whl wheelhouse
fi

# netedit tests
if test -e $SUMO_BINDIR/netedit -a $SUMO_BINDIR/netedit -nt build/$FILEPREFIX/Makefile; then
if test "$FILEPREFIX" == "gcc4_64"; then
tests/runNeteditDailyTests.sh -b ${FILEPREFIX}netedit -name $TESTLABEL >> $TESTLOG 2>&1
tests/runTests.sh -b ${FILEPREFIX} -name $TESTLABEL -coll >> $TESTLOG 2>&1
fi
fi

0 comments on commit a861fc2

Please sign in to comment.