diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index bae87cd..670555e 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -39,4 +39,6 @@ be merged. |- po/: Translation files, i18n stuff |- test/: Unit tests for libcriterion `- samples/: Sample files + |- outputs/: Expected output files for the current samples `- tests/: Internal regression tests + `- outputs/: Expected output files for the regression tests diff --git a/samples/CMakeLists.txt b/samples/CMakeLists.txt index a3a05ee..1dfbaca 100644 --- a/samples/CMakeLists.txt +++ b/samples/CMakeLists.txt @@ -7,28 +7,22 @@ include_directories(../include) set(SAMPLES signal.c - exit.c report.c suites.c fixtures.c asserts.c more-suites.c - long-messages.c description.c - other-crashes.c simple.c theories.c signal.cc - exit.cc report.cc suites.cc fixtures.cc asserts.cc more-suites.cc - long-messages.cc description.cc - other-crashes.cc simple.cc theories.cc ) @@ -56,7 +50,7 @@ macro(add_samples DIR_ SAMPLES_) ) if (NOT MSVC) # we disable the scripted tests when building with MSVC - add_test(${sample}_compare sh ${DIR_}/run_test.sh "${CMAKE_CURRENT_LIST_DIR}" . . ${sample}.bin) + add_test(${sample}_compare sh ${DIR_}/run_test.sh "${CMAKE_CURRENT_LIST_DIR}/out_dir" . . ${sample}.bin) set_property(TEST ${sample}_compare PROPERTY ENVIRONMENT "LC_ALL=en_US.utf8" ENVIRONMENT "CRITERION_ALWAYS_SUCCEED=1" diff --git a/samples/asserts.c.bin.err.expected b/samples/outputs/asserts.c.bin.err.expected similarity index 100% rename from samples/asserts.c.bin.err.expected rename to samples/outputs/asserts.c.bin.err.expected diff --git a/samples/asserts.c.bin.out.expected b/samples/outputs/asserts.c.bin.out.expected similarity index 100% rename from samples/asserts.c.bin.out.expected rename to samples/outputs/asserts.c.bin.out.expected diff --git a/samples/asserts.cc.bin.err.expected b/samples/outputs/asserts.cc.bin.err.expected similarity index 100% rename from samples/asserts.cc.bin.err.expected rename to samples/outputs/asserts.cc.bin.err.expected diff --git a/samples/asserts.cc.bin.out.expected b/samples/outputs/asserts.cc.bin.out.expected similarity index 100% rename from samples/asserts.cc.bin.out.expected rename to samples/outputs/asserts.cc.bin.out.expected diff --git a/samples/description.c.bin.err.expected b/samples/outputs/description.c.bin.err.expected similarity index 100% rename from samples/description.c.bin.err.expected rename to samples/outputs/description.c.bin.err.expected diff --git a/samples/description.c.bin.out.expected b/samples/outputs/description.c.bin.out.expected similarity index 100% rename from samples/description.c.bin.out.expected rename to samples/outputs/description.c.bin.out.expected diff --git a/samples/description.cc.bin.err.expected b/samples/outputs/description.cc.bin.err.expected similarity index 100% rename from samples/description.cc.bin.err.expected rename to samples/outputs/description.cc.bin.err.expected diff --git a/samples/description.cc.bin.out.expected b/samples/outputs/description.cc.bin.out.expected similarity index 100% rename from samples/description.cc.bin.out.expected rename to samples/outputs/description.cc.bin.out.expected diff --git a/samples/fixtures.c.bin.err.expected b/samples/outputs/fixtures.c.bin.err.expected similarity index 100% rename from samples/fixtures.c.bin.err.expected rename to samples/outputs/fixtures.c.bin.err.expected diff --git a/samples/fixtures.c.bin.out.expected b/samples/outputs/fixtures.c.bin.out.expected similarity index 100% rename from samples/fixtures.c.bin.out.expected rename to samples/outputs/fixtures.c.bin.out.expected diff --git a/samples/fixtures.cc.bin.err.expected b/samples/outputs/fixtures.cc.bin.err.expected similarity index 100% rename from samples/fixtures.cc.bin.err.expected rename to samples/outputs/fixtures.cc.bin.err.expected diff --git a/samples/fixtures.cc.bin.out.expected b/samples/outputs/fixtures.cc.bin.out.expected similarity index 100% rename from samples/fixtures.cc.bin.out.expected rename to samples/outputs/fixtures.cc.bin.out.expected diff --git a/samples/more-suites.c.bin.err.expected b/samples/outputs/more-suites.c.bin.err.expected similarity index 100% rename from samples/more-suites.c.bin.err.expected rename to samples/outputs/more-suites.c.bin.err.expected diff --git a/samples/more-suites.c.bin.out.expected b/samples/outputs/more-suites.c.bin.out.expected similarity index 100% rename from samples/more-suites.c.bin.out.expected rename to samples/outputs/more-suites.c.bin.out.expected diff --git a/samples/more-suites.cc.bin.err.expected b/samples/outputs/more-suites.cc.bin.err.expected similarity index 100% rename from samples/more-suites.cc.bin.err.expected rename to samples/outputs/more-suites.cc.bin.err.expected diff --git a/samples/more-suites.cc.bin.out.expected b/samples/outputs/more-suites.cc.bin.out.expected similarity index 100% rename from samples/more-suites.cc.bin.out.expected rename to samples/outputs/more-suites.cc.bin.out.expected diff --git a/samples/other-crashes.c.bin.err.expected b/samples/outputs/other-crashes.c.bin.err.expected similarity index 100% rename from samples/other-crashes.c.bin.err.expected rename to samples/outputs/other-crashes.c.bin.err.expected diff --git a/samples/other-crashes.c.bin.out.expected b/samples/outputs/other-crashes.c.bin.out.expected similarity index 100% rename from samples/other-crashes.c.bin.out.expected rename to samples/outputs/other-crashes.c.bin.out.expected diff --git a/samples/other-crashes.cc.bin.err.expected b/samples/outputs/other-crashes.cc.bin.err.expected similarity index 100% rename from samples/other-crashes.cc.bin.err.expected rename to samples/outputs/other-crashes.cc.bin.err.expected diff --git a/samples/other-crashes.cc.bin.out.expected b/samples/outputs/other-crashes.cc.bin.out.expected similarity index 100% rename from samples/other-crashes.cc.bin.out.expected rename to samples/outputs/other-crashes.cc.bin.out.expected diff --git a/samples/report.c.bin.err.expected b/samples/outputs/report.c.bin.err.expected similarity index 100% rename from samples/report.c.bin.err.expected rename to samples/outputs/report.c.bin.err.expected diff --git a/samples/report.c.bin.out.expected b/samples/outputs/report.c.bin.out.expected similarity index 100% rename from samples/report.c.bin.out.expected rename to samples/outputs/report.c.bin.out.expected diff --git a/samples/report.cc.bin.err.expected b/samples/outputs/report.cc.bin.err.expected similarity index 100% rename from samples/report.cc.bin.err.expected rename to samples/outputs/report.cc.bin.err.expected diff --git a/samples/report.cc.bin.out.expected b/samples/outputs/report.cc.bin.out.expected similarity index 100% rename from samples/report.cc.bin.out.expected rename to samples/outputs/report.cc.bin.out.expected diff --git a/samples/signal.c.bin.err.expected b/samples/outputs/signal.c.bin.err.expected similarity index 100% rename from samples/signal.c.bin.err.expected rename to samples/outputs/signal.c.bin.err.expected diff --git a/samples/signal.c.bin.out.expected b/samples/outputs/signal.c.bin.out.expected similarity index 100% rename from samples/signal.c.bin.out.expected rename to samples/outputs/signal.c.bin.out.expected diff --git a/samples/signal.cc.bin.err.expected b/samples/outputs/signal.cc.bin.err.expected similarity index 100% rename from samples/signal.cc.bin.err.expected rename to samples/outputs/signal.cc.bin.err.expected diff --git a/samples/signal.cc.bin.out.expected b/samples/outputs/signal.cc.bin.out.expected similarity index 100% rename from samples/signal.cc.bin.out.expected rename to samples/outputs/signal.cc.bin.out.expected diff --git a/samples/simple.c.bin.err.expected b/samples/outputs/simple.c.bin.err.expected similarity index 100% rename from samples/simple.c.bin.err.expected rename to samples/outputs/simple.c.bin.err.expected diff --git a/samples/simple.c.bin.out.expected b/samples/outputs/simple.c.bin.out.expected similarity index 100% rename from samples/simple.c.bin.out.expected rename to samples/outputs/simple.c.bin.out.expected diff --git a/samples/simple.cc.bin.err.expected b/samples/outputs/simple.cc.bin.err.expected similarity index 100% rename from samples/simple.cc.bin.err.expected rename to samples/outputs/simple.cc.bin.err.expected diff --git a/samples/simple.cc.bin.out.expected b/samples/outputs/simple.cc.bin.out.expected similarity index 100% rename from samples/simple.cc.bin.out.expected rename to samples/outputs/simple.cc.bin.out.expected diff --git a/samples/suites.c.bin.err.expected b/samples/outputs/suites.c.bin.err.expected similarity index 100% rename from samples/suites.c.bin.err.expected rename to samples/outputs/suites.c.bin.err.expected diff --git a/samples/suites.c.bin.out.expected b/samples/outputs/suites.c.bin.out.expected similarity index 100% rename from samples/suites.c.bin.out.expected rename to samples/outputs/suites.c.bin.out.expected diff --git a/samples/suites.cc.bin.err.expected b/samples/outputs/suites.cc.bin.err.expected similarity index 100% rename from samples/suites.cc.bin.err.expected rename to samples/outputs/suites.cc.bin.err.expected diff --git a/samples/suites.cc.bin.out.expected b/samples/outputs/suites.cc.bin.out.expected similarity index 100% rename from samples/suites.cc.bin.out.expected rename to samples/outputs/suites.cc.bin.out.expected diff --git a/samples/tests/CMakeLists.txt b/samples/tests/CMakeLists.txt index 6399df5..d5b4da5 100644 --- a/samples/tests/CMakeLists.txt +++ b/samples/tests/CMakeLists.txt @@ -1,5 +1,12 @@ set(SAMPLES failmessages.c + exit.c + long-messages.c + other-crashes.c + + exit.cc + long-messages.cc + other-crashes.cc ) add_samples("${CMAKE_CURRENT_LIST_DIR}" "${SAMPLES}") diff --git a/samples/exit.c b/samples/tests/exit.c similarity index 100% rename from samples/exit.c rename to samples/tests/exit.c diff --git a/samples/exit.cc b/samples/tests/exit.cc similarity index 100% rename from samples/exit.cc rename to samples/tests/exit.cc diff --git a/samples/long-messages.c b/samples/tests/long-messages.c similarity index 100% rename from samples/long-messages.c rename to samples/tests/long-messages.c diff --git a/samples/long-messages.cc b/samples/tests/long-messages.cc similarity index 100% rename from samples/long-messages.cc rename to samples/tests/long-messages.cc diff --git a/samples/other-crashes.c b/samples/tests/other-crashes.c similarity index 100% rename from samples/other-crashes.c rename to samples/tests/other-crashes.c diff --git a/samples/other-crashes.cc b/samples/tests/other-crashes.cc similarity index 100% rename from samples/other-crashes.cc rename to samples/tests/other-crashes.cc diff --git a/samples/exit.c.bin.err.expected b/samples/tests/outputs/exit.c.bin.err.expected similarity index 100% rename from samples/exit.c.bin.err.expected rename to samples/tests/outputs/exit.c.bin.err.expected diff --git a/samples/exit.c.bin.out.expected b/samples/tests/outputs/exit.c.bin.out.expected similarity index 100% rename from samples/exit.c.bin.out.expected rename to samples/tests/outputs/exit.c.bin.out.expected diff --git a/samples/exit.cc.bin.err.expected b/samples/tests/outputs/exit.cc.bin.err.expected similarity index 100% rename from samples/exit.cc.bin.err.expected rename to samples/tests/outputs/exit.cc.bin.err.expected diff --git a/samples/exit.cc.bin.out.expected b/samples/tests/outputs/exit.cc.bin.out.expected similarity index 100% rename from samples/exit.cc.bin.out.expected rename to samples/tests/outputs/exit.cc.bin.out.expected diff --git a/samples/tests/failmessages.c.bin.err.expected b/samples/tests/outputs/failmessages.c.bin.err.expected similarity index 100% rename from samples/tests/failmessages.c.bin.err.expected rename to samples/tests/outputs/failmessages.c.bin.err.expected diff --git a/samples/tests/failmessages.c.bin.out.expected b/samples/tests/outputs/failmessages.c.bin.out.expected similarity index 100% rename from samples/tests/failmessages.c.bin.out.expected rename to samples/tests/outputs/failmessages.c.bin.out.expected diff --git a/samples/long-messages.c.bin.err.expected b/samples/tests/outputs/long-messages.c.bin.err.expected similarity index 100% rename from samples/long-messages.c.bin.err.expected rename to samples/tests/outputs/long-messages.c.bin.err.expected diff --git a/samples/long-messages.c.bin.out.expected b/samples/tests/outputs/long-messages.c.bin.out.expected similarity index 100% rename from samples/long-messages.c.bin.out.expected rename to samples/tests/outputs/long-messages.c.bin.out.expected diff --git a/samples/long-messages.cc.bin.err.expected b/samples/tests/outputs/long-messages.cc.bin.err.expected similarity index 100% rename from samples/long-messages.cc.bin.err.expected rename to samples/tests/outputs/long-messages.cc.bin.err.expected diff --git a/samples/long-messages.cc.bin.out.expected b/samples/tests/outputs/long-messages.cc.bin.out.expected similarity index 100% rename from samples/long-messages.cc.bin.out.expected rename to samples/tests/outputs/long-messages.cc.bin.out.expected diff --git a/samples/with-time.c b/samples/tests/with-time.c similarity index 100% rename from samples/with-time.c rename to samples/tests/with-time.c