diff options
Diffstat (limited to 'test/camera')
| -rw-r--r-- | test/camera/camera_reconfigure.cpp | 4 | ||||
| -rw-r--r-- | test/camera/meson.build | 18 |
2 files changed, 11 insertions, 11 deletions
diff --git a/test/camera/camera_reconfigure.cpp b/test/camera/camera_reconfigure.cpp index f6076baa..06c87730 100644 --- a/test/camera/camera_reconfigure.cpp +++ b/test/camera/camera_reconfigure.cpp @@ -98,7 +98,7 @@ private: return TestFail; } - requests_.push_back(move(request)); + requests_.push_back(std::move(request)); } camera_->requestCompleted.connect(this, &CameraReconfigure::requestComplete); @@ -179,7 +179,7 @@ private: continue; string pname("/proc/" + string(ptr->d_name) + "/comm"); - if (File::exists(pname.c_str())) { + if (File::exists(pname)) { ifstream pfile(pname.c_str()); string comm; getline(pfile, comm); diff --git a/test/camera/meson.build b/test/camera/meson.build index 668d5c03..4f9f8c8c 100644 --- a/test/camera/meson.build +++ b/test/camera/meson.build @@ -3,18 +3,18 @@ # Tests are listed in order of complexity. # They are not alphabetically sorted. camera_tests = [ - ['configuration_default', 'configuration_default.cpp'], - ['configuration_set', 'configuration_set.cpp'], - ['buffer_import', 'buffer_import.cpp'], - ['statemachine', 'statemachine.cpp'], - ['capture', 'capture.cpp'], - ['camera_reconfigure', 'camera_reconfigure.cpp'], + {'name': 'configuration_default', 'sources': ['configuration_default.cpp']}, + {'name': 'configuration_set', 'sources': ['configuration_set.cpp']}, + {'name': 'buffer_import', 'sources': ['buffer_import.cpp']}, + {'name': 'statemachine', 'sources': ['statemachine.cpp']}, + {'name': 'capture', 'sources': ['capture.cpp']}, + {'name': 'camera_reconfigure', 'sources': ['camera_reconfigure.cpp']}, ] -foreach t : camera_tests - exe = executable(t[0], t[1], +foreach test : camera_tests + exe = executable(test['name'], test['sources'], dependencies : libcamera_private, link_with : test_libraries, include_directories : test_includes_internal) - test(t[0], exe, suite : 'camera', is_parallel : false) + test(test['name'], exe, suite : 'camera', is_parallel : false) endforeach |