Another improvements to 'tests/defs', factored out from my on-going
refactoring of test scripts setup. This time it is (should be) a real
improvement, not just a cosmetic one.
Regards,
Stefano
-*-*-*-
Fix code for requiring gfortran and g77 in tests.
* tests/defs.in: Correctly set and export F77 and/or FC when g77
and/or gfortran are in $required, even when they both required.
---
ChangeLog | 4 ++++
tests/defs.in | 22 ++++++++++++++++++++++
From e51877a696ec8c125d1348e8b022881e4c7b23ca Mon Sep 17 00:00:00 2001
From: Stefano Lattarini <[email protected]>
Date: Wed, 2 Jun 2010 21:19:49 +0200
Subject: [PATCH] Fix code for requiring gfortran and g77 in tests.
* tests/defs.in: Correctly set and export F77 and/or FC when g77
and/or gfortran are in $required, even when they both required.
---
ChangeLog | 4 ++++
tests/defs.in | 22 ++++++++++++++++++++++
2 files changed, 26 insertions(+), 0 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index b5f1433..d52bfee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2010-06-13 Stefano Lattarini <[email protected]>
+ Fix code for requiring gfortran and g77 in tests.
+ * tests/defs.in: Correctly set and export F77 and/or FC when g77
+ and/or gfortran are in $required, even when they both required.
+
Add useful comment in test script obsolete.test.
* tests/obsolte.test: Add a comment explaining why we need
an indirection in adding $AUTOUPDATE to $required.
diff --git a/tests/defs.in b/tests/defs.in
index 9bb6333..555f7bc 100644
--- a/tests/defs.in
+++ b/tests/defs.in
@@ -143,6 +143,28 @@ do
echo "$me: running $CXX --version"
( $CXX --version ) || exit 77
;;
+ gfortran)
+ FC=gfortran
+ export FC
+ echo "$me: running $FC --version"
+ ( $FC --version ) || exit 77
+ # This ensures that gfortran and g77 can both be required.
+ case " $required " in
+ *\ g77\ *);;
+ *) F77=$FC; export F77;;
+ esac
+ ;;
+ g77)
+ F77=g77
+ export F77
+ echo "$me: running $F77 --version"
+ ( $F77 --version ) || exit 77
+ # This ensures that gfortran and g77 can both be required.
+ case " $required " in
+ *\ gfortran\ *);;
+ *) FC=$F77; export FC;;
+ esac
+ ;;
icc)
CC=icc
export CC
--
1.6.5
