diff --git a/deploy/docker/Dockerfile b/deploy/docker/Dockerfile index 2f2154e..10d1554 100644 --- a/deploy/docker/Dockerfile +++ b/deploy/docker/Dockerfile @@ -46,12 +46,12 @@ RUN cmake -P tools/prepare-sdl3.cmake \ && cmake --build build/client-probe --target evo-client-state-tests evo-ui-probe evo-client-probe evo-client evo-client-lifecycle-tests evo-client-environment-tests evo-client-organism-tests evo-client-ui-model-tests evo-client-panel-tests evo-client-bindings-tests --parallel 2 \ && ctest --preset client-probe --no-tests=error \ && xvfb-run -a env SDL_VIDEO_DRIVER=x11 ./build/client-probe/evo-client-probe --renderer software \ - && xvfb-run -a env SDL_VIDEO_DRIVER=x11 ./build/client-probe/evo-ui-probe --renderer software \ + && for cycle in 1 2 3; do xvfb-run -a env SDL_VIDEO_DRIVER=x11 ./build/client-probe/evo-ui-probe --renderer software --cycles 1; done \ && xvfb-run -a env SDL_VIDEO_DRIVER=x11 ./build/client-probe/evo-client-lifecycle-tests \ && cmake --preset client-probe -DEVO_BUILD_CLIENT=ON -DEVO_SANITIZER=address -DEVO_ENABLE_TIDY=OFF \ && cmake --build build/client-probe --target evo-client-state-tests evo-ui-probe evo-client evo-client-lifecycle-tests evo-client-environment-tests evo-client-organism-tests evo-client-ui-model-tests evo-client-panel-tests evo-client-bindings-tests --parallel 2 \ && ctest --preset client-probe --no-tests=error \ - && xvfb-run -a env SDL_VIDEO_DRIVER=x11 ./build/client-probe/evo-ui-probe --renderer software \ + && for cycle in 1 2 3; do xvfb-run -a env SDL_VIDEO_DRIVER=x11 ./build/client-probe/evo-ui-probe --renderer software --cycles 1; done \ && xvfb-run -a env SDL_VIDEO_DRIVER=x11 ./build/client-probe/evo-client-lifecycle-tests FROM ci-source AS ci-network diff --git a/experiments/ui/main.cpp b/experiments/ui/main.cpp index 155ec99..23f2d98 100644 --- a/experiments/ui/main.cpp +++ b/experiments/ui/main.cpp @@ -1,6 +1,7 @@ // M9.8a toolkit qualification only: no simulation, network, or authority state. #include #include +#include #include #include #include @@ -8,6 +9,7 @@ #include #include #include +#include namespace { void require(bool ok, const char* message) { @@ -108,11 +110,23 @@ void run(const char* driver) { } // namespace int main(int argc, char** argv) try { const char* driver = nullptr; - if (argc == 3 && std::string_view{argv[1]} == "--renderer") - driver = argv[2]; - else if (argc != 1) - return 2; - for (int cycle = 0; cycle < 3; ++cycle) + int cycles = 3; + for (int index = 1; index < argc;) { + const std::string_view option{argv[index++]}; + if (option == "--renderer" && index < argc) { + driver = argv[index++]; + } else if (option == "--cycles" && index < argc) { + const std::string_view value{argv[index++]}; + const auto [end, error] = + std::from_chars(value.data(), value.data() + value.size(), cycles); + if (error != std::errc{} || end != value.data() + value.size() || cycles < 1 || + cycles > 16) + return 2; + } else { + return 2; + } + } + for (int cycle = 0; cycle < cycles; ++cycle) run(driver); return 0; } catch (const std::exception& error) {