From: Matthias Maier Date: Thu, 19 Sep 2013 10:15:09 +0000 (+0000) Subject: Merge trunk into branch_port_the_testsuite X-Git-Tag: v8.1.0~570^2~270 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2bcfa2c717b1f2d92c120296419188d15682f7ac;p=dealii.git Merge trunk into branch_port_the_testsuite git-svn-id: https://svn.dealii.org/branches/branch_port_the_testsuite@30823 0785d39b-7218-0410-832d-ea1e28bc413d --- 2bcfa2c717b1f2d92c120296419188d15682f7ac diff --cc tests/bits/faceq_face_interpolation.cc index 4bd06fa87e,ca0d906738..9e6efe0e2c --- a/tests/bits/faceq_face_interpolation.cc +++ b/tests/bits/faceq_face_interpolation.cc @@@ -19,10 -19,10 +19,10 @@@ #include // check - // FE_FaceQ::face_interpolation + // FE_FaceQ/P::face_interpolation -std::string output_file_name = "faceq_face_interpolation/output"; +std::string output_file_name = "output"; void diff --cc tests/bits/faceq_subface_interpolation.cc index 4571796713,ecf6cb3196..cd85880d0a --- a/tests/bits/faceq_subface_interpolation.cc +++ b/tests/bits/faceq_subface_interpolation.cc @@@ -19,10 -19,10 +19,10 @@@ #include // check - // FE_FaceQ::subface_interpolation + // FE_FaceQ/P::subface_interpolation -std::string output_file_name = "faceq_subface_interpolation/output"; +std::string output_file_name = "output"; void