[cig-commits] [commit] master: replace absolute dir names in test output, fix two tests (4f4abb3)

[cig_noreply at geodynamics.org]

Repository : https://github.com/geodynamics/aspect

On branch  : master
Link       : https://github.com/geodynamics/aspect/compare/2093d1d781d5a2fbb827f8dac1c200302399703d...4f4abb319deeb11a093d90f6dd9651ea821c90a8

>---------------------------------------------------------------

commit 4f4abb319deeb11a093d90f6dd9651ea821c90a8
Author: Timo Heister <timo.heister at gmail.com>
Date:   Sun May 25 08:17:43 2014 -0400

    replace absolute dir names in test output, fix two tests


>---------------------------------------------------------------

4f4abb319deeb11a093d90f6dd9651ea821c90a8
 tests/CMakeLists.txt            | 3 +++
 tests/gplates-1-3/screen-output | 4 ++--
 tests/gplates-1-4/screen-output | 4 ++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index c3dd02d..201963e 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -185,6 +185,8 @@ FOREACH(_test ${_tests})
   FOREACH(_output ${_outputs})
     GET_FILENAME_COMPONENT(_output ${_output} NAME)
 
+    get_filename_component(ASPECT_BASE_DIR ${CMAKE_CURRENT_SOURCE_DIR} PATH)
+
     # create the output.notime targets for each of the output files,
     # and also create a similar file for all of the input files (this
     # avoids the need to strip timing information from files we may
@@ -207,6 +209,7 @@ FOREACH(_test ${_tests})
 	cat ${CMAKE_CURRENT_BINARY_DIR}/output-${_test}/${_output}
         | egrep -v '^\\|.*\\|'
 	| egrep -v '^--'
+	| sed 's\#${ASPECT_BASE_DIR}\#ASPECT_DIR\#g'
         > ${CMAKE_CURRENT_BINARY_DIR}/output-${_test}/${_output}.notime
       DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/output-${_test}/screen-output
               ${CMAKE_CURRENT_BINARY_DIR}/output-${_test}/${_output}.cmp.notime
diff --git a/tests/gplates-1-3/screen-output b/tests/gplates-1-3/screen-output
index 438969c..38cb8d8 100644
--- a/tests/gplates-1-3/screen-output
+++ b/tests/gplates-1-3/screen-output
@@ -19,10 +19,10 @@ Number of degrees of freedom: 10,656 (6,528+864+3,264)
    Model will be rotated by 0.00 degrees around axis 0.00 0.00 1.00
 
 
-   Loading GPlates boundary velocity file /home/rengas/Software/Aspect-Versionen/aspect/data/velocity-boundary-conditions/gplates/current_day.gpml.
+   Loading GPlates boundary velocity file ASPECT_DIR/data/velocity-boundary-conditions/gplates/current_day.gpml.
 
 
-   Loading GPlates boundary velocity file /home/rengas/Software/Aspect-Versionen/aspect/data/velocity-boundary-conditions/gplates/current_day.gpml.
+   Loading GPlates boundary velocity file ASPECT_DIR/data/velocity-boundary-conditions/gplates/current_day.gpml.
 
 
    Loading new velocity file did not succeed.
diff --git a/tests/gplates-1-4/screen-output b/tests/gplates-1-4/screen-output
index 0604a0d..1b911e2 100644
--- a/tests/gplates-1-4/screen-output
+++ b/tests/gplates-1-4/screen-output
@@ -19,10 +19,10 @@ Number of degrees of freedom: 10,656 (6,528+864+3,264)
    Model will be rotated by 0.00 degrees around axis 0.00 0.00 1.00
 
 
-   Loading GPlates boundary velocity file /home/rengas/Software/Aspect-Versionen/aspect/data/velocity-boundary-conditions/gplates/current_day_1.4.gpml.
+   Loading GPlates boundary velocity file ASPECT_DIR/data/velocity-boundary-conditions/gplates/current_day_1.4.gpml.
 
 
-   Loading GPlates boundary velocity file /home/rengas/Software/Aspect-Versionen/aspect/data/velocity-boundary-conditions/gplates/current_day_1.4.gpml.
+   Loading GPlates boundary velocity file ASPECT_DIR/data/velocity-boundary-conditions/gplates/current_day_1.4.gpml.
 
 
    Loading new velocity file did not succeed.