Commit bba318ae authored by Praetorius, Simon's avatar Praetorius, Simon
Browse files

output file names in tests made unique

parent 26d2a369
......@@ -6,22 +6,11 @@ debian:10 gcc-8-17:
debian:10 clang-6-libcpp-17:
image: registry.dune-project.org/docker/ci/dune:2.6-debian-10-clang-6-libcpp-17
script: duneci-standard-test
artifacts:
name: "$CI_JOB_STAGE-$CI_COMMIT_REF_NAME"
when: on_failure
paths:
- /tmp/reader_writer_test_ascii32.vtu
- /tmp/reader_writer_test_bin32.vtu
- /tmp/reader_writer_test_zlib32.vtu
- /tmp/reader_writer_test_ascii64.vtu
- /tmp/reader_writer_test_bin64.vtu
- /tmp/reader_writer_test_zlib64.vtu
expire_in: 1 day
#debian:9 gcc-6-14:
# image: registry.dune-project.org/docker/ci/dune:2.6-debian-9-gcc-6-14
# script: duneci-standard-test
debian:9 gcc-6-14:
image: registry.dune-project.org/docker/ci/dune:2.6-debian-9-gcc-6-14
script: duneci-standard-test
#ubuntu:18.04 clang-6-17:
# image: registry.dune-project.org/docker/ci/dune:2.6-ubuntu-18.04-clang-6-17
# script: duneci-standard-test
ubuntu:18.04 clang-6-17:
image: registry.dune-project.org/docker/ci/dune:2.6-ubuntu-18.04-clang-6-17
script: duneci-standard-test
......@@ -22,6 +22,7 @@ void VtkReader<Grid,Creator>::readFromFile (std::string const& filename)
DUNE_THROW(IOError, "File " << filename << " does not exist!");
std::ifstream input(filename, std::ios_base::in | std::ios_base::binary);
assert(input.is_open());
std::string compressor = "";
std::string data_name = "", data_format = "";
......
......@@ -71,7 +71,7 @@ void writer_test (GridView const& gridView)
{
for (auto const& test_case : test_cases) {
VtkUnstructuredGridWriter<GridView> vtkWriter(gridView, std::get<1>(test_case), std::get<2>(test_case));
vtkWriter.write("/tmp/reader_writer_test_" + std::get<0>(test_case) + ".vtu");
vtkWriter.write("mixed_element_test_" + std::get<0>(test_case) + ".vtu");
}
}
......@@ -79,12 +79,12 @@ template <class Grid, class Test>
void reader_test (Test& test)
{
for (auto const& test_case : test_cases) {
auto grid = VtkReader<Grid>::read("/tmp/reader_writer_test_" + std::get<0>(test_case) + ".vtu");
auto grid = VtkReader<Grid>::read("mixed_element_test_" + std::get<0>(test_case) + ".vtu");
VtkUnstructuredGridWriter<typename Grid::LeafGridView> vtkWriter(grid->leafGridView(),
std::get<1>(test_case), std::get<2>(test_case));
vtkWriter.write("/tmp/reader_writer_test_" + std::get<0>(test_case) + "_2.vtu");
test.check(compare_files("/tmp/reader_writer_test_" + std::get<0>(test_case) + ".vtu",
"/tmp/reader_writer_test_" + std::get<0>(test_case) + "_2.vtu"), std::get<0>(test_case));
vtkWriter.write("mixed_element_test_" + std::get<0>(test_case) + "_2.vtu");
test.check(compare_files("mixed_element_test_" + std::get<0>(test_case) + ".vtu",
"mixed_element_test_" + std::get<0>(test_case) + "_2.vtu"), std::get<0>(test_case));
}
}
......
......@@ -71,7 +71,7 @@ void writer_test (GridView const& gridView)
{
for (auto const& test_case : test_cases) {
VtkUnstructuredGridWriter<GridView> vtkWriter(gridView, std::get<1>(test_case), std::get<2>(test_case));
vtkWriter.write("/tmp/reader_writer_test_" + std::get<0>(test_case) + ".vtu");
vtkWriter.write("reader_writer_test_" + std::get<0>(test_case) + ".vtu");
}
}
......@@ -79,12 +79,12 @@ template <class Grid, class Test>
void reader_test (Test& test)
{
for (auto const& test_case : test_cases) {
auto grid = VtkReader<Grid>::read("/tmp/reader_writer_test_" + std::get<0>(test_case) + ".vtu");
auto grid = VtkReader<Grid>::read("reader_writer_test_" + std::get<0>(test_case) + ".vtu");
VtkUnstructuredGridWriter<typename Grid::LeafGridView> vtkWriter(grid->leafGridView(),
std::get<1>(test_case), std::get<2>(test_case));
vtkWriter.write("/tmp/reader_writer_test_" + std::get<0>(test_case) + "_2.vtu");
test.check(compare_files("/tmp/reader_writer_test_" + std::get<0>(test_case) + ".vtu",
"/tmp/reader_writer_test_" + std::get<0>(test_case) + "_2.vtu"));
vtkWriter.write("reader_writer_test_" + std::get<0>(test_case) + "_2.vtu");
test.check(compare_files("reader_writer_test_" + std::get<0>(test_case) + ".vtu",
"reader_writer_test_" + std::get<0>(test_case) + "_2.vtu"));
}
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment