p71924506
/
carla
mirror of https://github.com/carla-simulator/carla.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Smoke test fix, and windows clean fix

This commit is contained in:
bernat 2020-04-17 16:57:03 +02:00
parent 6a4479ed16
commit 19627ac094
2 changed files with 122 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
PythonAPI/test/smoke/test_snapshot.py
View File

@ -24,6 +24,9 @@ class TestSnapshot(SyncSmokeTest):
spawn_points = self.world.get_map().get_spawn_points()[:20] spawn_points = self.world.get_map().get_spawn_points()[:20]
vehicles = self.world.get_blueprint_library().filter('vehicle.*') vehicles = self.world.get_blueprint_library().filter('vehicle.*')
# move spawn points a bit higher, they are too close to the floor
for t in spawn_points:
t.location.z += 0.30
batch = [(random.choice(vehicles), t) for t in spawn_points] batch = [(random.choice(vehicles), t) for t in spawn_points]
batch = [carla.command.SpawnActor(*args) for args in batch] batch = [carla.command.SpawnActor(*args) for args in batch]
response = self.client.apply_batch_sync(batch, True) response = self.client.apply_batch_sync(batch, True)

10
Util/BuildTools/Package.bat
View File

@ -31,6 +31,10 @@ set PACKAGES=Carla
if not "%1"=="" ( if not "%1"=="" (
if "%1"=="--clean" ( if "%1"=="--clean" (
set DO_CLEAN=true set DO_CLEAN=true
set DO_TARBALL=false
set DO_PACKAGE=false
set DO_COPY_FILES=false
) )
if "%1"=="--no-zip" ( if "%1"=="--no-zip" (
@ -46,6 +50,8 @@ if not "%1"=="" (
) )
if "%1"=="--packages" ( if "%1"=="--packages" (
set DO_PACKAGE=false
set DO_COPY_FILES=false
set PACKAGES=%~2 set PACKAGES=%~2
) )
@ -79,7 +85,6 @@ for /f %%i in ('git describe --tags --dirty --always') do set CARLA_VERSION=%%i
if not defined CARLA_VERSION goto error_carla_version if not defined CARLA_VERSION goto error_carla_version
set BUILD_FOLDER=%INSTALLATION_DIR%UE4Carla/%CARLA_VERSION%/ set BUILD_FOLDER=%INSTALLATION_DIR%UE4Carla/%CARLA_VERSION%/
if not exist "!BUILD_FOLDER!" mkdir "!BUILD_FOLDER!"
set DESTINATION_ZIP=%INSTALLATION_DIR%UE4Carla/CARLA_%CARLA_VERSION%.zip set DESTINATION_ZIP=%INSTALLATION_DIR%UE4Carla/CARLA_%CARLA_VERSION%.zip
set SOURCE=!BUILD_FOLDER!WindowsNoEditor/ set SOURCE=!BUILD_FOLDER!WindowsNoEditor/
@ -89,6 +94,8 @@ rem -- Create Carla package ----------------------------------------------------
rem ============================================================================ rem ============================================================================
if %DO_PACKAGE%==true ( if %DO_PACKAGE%==true (
if not exist "!BUILD_FOLDER!" mkdir "!BUILD_FOLDER!"
call "%UE4_ROOT%\Engine\Build\BatchFiles\Build.bat"^ call "%UE4_ROOT%\Engine\Build\BatchFiles\Build.bat"^
CarlaUE4Editor^ CarlaUE4Editor^
Win64^ Win64^
@ -316,6 +323,7 @@ for %%i in (%PACKAGES%) do (
if errorlevel 1 goto bad_exit if errorlevel 1 goto bad_exit
echo ZIP created at !DST_ZIP! echo ZIP created at !DST_ZIP!
) )
popd popd
if %DO_CLEAN%==true ( if %DO_CLEAN%==true (