Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .clang-format
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ IndentPPDirectives: None
IndentWidth: 4
KeepEmptyLinesAtTheStartOfBlocks: true
MaxEmptyLinesToKeep: 2
SpaceBeforeCpp11BracedList: true
StatementMacros: [
'Register_ResultFilter', 'Register_ResultFilter2',
'Register_ResultRecorder', 'Register_ResultRecorder2',
Expand Down
3 changes: 2 additions & 1 deletion src/traci/BasicNodeManager.cc
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ static const std::set<int> sPersonVariables {
libsumo::VAR_POSITION, libsumo::VAR_SPEED, libsumo::VAR_ANGLE, libsumo::VAR_VEHICLE
};
static const std::set<int> sVehicleVariables {
libsumo::VAR_POSITION, libsumo::VAR_SPEED, libsumo::VAR_ANGLE
libsumo::VAR_POSITION, libsumo::VAR_SPEED, libsumo::VAR_ANGLE, libsumo::VAR_MAXSPEED
// VAR_MAXSPEED is cached for INET's MediumLimitCache
};
static const std::set<int> sSimulationVariables {
libsumo::VAR_DEPARTED_VEHICLES_IDS, libsumo::VAR_ARRIVED_VEHICLES_IDS, libsumo::VAR_TELEPORT_STARTING_VEHICLES_IDS,
Expand Down
6 changes: 5 additions & 1 deletion tools/ci/run.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import sys
import unittest
import argparse

Expand Down Expand Up @@ -26,7 +27,7 @@ def main():
scenario_path = args.scenario_base_dir / scenario_name
if not scenario_path.is_dir():
raise FileNotFoundError

test_config = config_loader.test_config(scenario_name)
for config in test_config.test_runner.tested_configurations:
test_case = ArteryTestFactory.make(args.launch_conf, scenario_path, test_config, config)
Expand All @@ -36,6 +37,9 @@ def main():
result = runner.run(suite)
result.printErrors()

if result.errors:
sys.exit(1)


if __name__ == '__main__':
main()