Updated remaining Fortran tests to use fixture over import.

30 files changed, 42 insertions, 78 deletions

diff --git a/test/Fortran/F03COM.py b/test/Fortran/F03COM.py
index b0d1f79..dc1523e 100644
--- a/test/Fortran/F03COM.py
+++ b/test/Fortran/F03COM.py
@@ -26,14 +26,12 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import TestSCons
 
-from common import write_fake_link
-
 _python_ = TestSCons._python_
 _exe   = TestSCons._exe
 
 test = TestSCons.TestSCons()
 
-write_fake_link(test)
+test.file_fixture('mylink.py')
 
 test.write('myfortran.py', r"""
 import sys
diff --git a/test/Fortran/F03FILESUFFIXES.py b/test/Fortran/F03FILESUFFIXES.py
index ffc2169..b1d2b93 100644
--- a/test/Fortran/F03FILESUFFIXES.py
+++ b/test/Fortran/F03FILESUFFIXES.py
@@ -26,14 +26,12 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import TestSCons
 
-from common import write_fake_link
-
 _python_ = TestSCons._python_
 _exe   = TestSCons._exe
 
 test = TestSCons.TestSCons()
 
-write_fake_link(test)
+test.file_fixture('mylink.py')
 
 test.write('myfortran.py', r"""
 import getopt
diff --git a/test/Fortran/F03FILESUFFIXES2.py b/test/Fortran/F03FILESUFFIXES2.py
index 77a601f..44be880 100644
--- a/test/Fortran/F03FILESUFFIXES2.py
+++ b/test/Fortran/F03FILESUFFIXES2.py
@@ -26,14 +26,12 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import TestSCons
 
-from common import write_fake_link
-
 _python_ = TestSCons._python_
 _exe   = TestSCons._exe
 
 test = TestSCons.TestSCons()
 
-write_fake_link(test)
+test.file_fixture('mylink.py')
 
 test.write('myfortran.py', r"""
 import getopt
diff --git a/test/Fortran/F03FLAGS.py b/test/Fortran/F03FLAGS.py
index 0c5bf93..b11b780 100644
--- a/test/Fortran/F03FLAGS.py
+++ b/test/Fortran/F03FLAGS.py
@@ -26,14 +26,12 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import TestSCons
 
-from common import write_fake_link
-
 _python_ = TestSCons._python_
 
 test = TestSCons.TestSCons()
 _exe = TestSCons._exe
 
-write_fake_link(test)
+test.file_fixture('mylink.py')
 
 test.write('myfortran.py', r"""
 import getopt
diff --git a/test/Fortran/F08.py b/test/Fortran/F08.py
index 35df37c..b61b861 100644
--- a/test/Fortran/F08.py
+++ b/test/Fortran/F08.py
@@ -26,14 +26,12 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import TestSCons
 
-from common import write_fake_link
-
 _python_ = TestSCons._python_
 _exe   = TestSCons._exe
 
 test = TestSCons.TestSCons()
 
-write_fake_link(test)
+test.file_fixture('mylink.py')
 
 test.write('myfortran.py', r"""
 import getopt
diff --git a/test/Fortran/F08COM.py b/test/Fortran/F08COM.py
index 783a163..363c2d0 100644
--- a/test/Fortran/F08COM.py
+++ b/test/Fortran/F08COM.py
@@ -26,14 +26,12 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import TestSCons
 
-from common import write_fake_link
-
 _python_ = TestSCons._python_
 _exe   = TestSCons._exe
 
 test = TestSCons.TestSCons()
 
-write_fake_link(test)
+test.file_fixture('mylink.py')
 
 test.write('myfortran.py', r"""
 import sys
diff --git a/test/Fortran/F08FILESUFFIXES.py b/test/Fortran/F08FILESUFFIXES.py
index 8463403..41059af 100644
--- a/test/Fortran/F08FILESUFFIXES.py
+++ b/test/Fortran/F08FILESUFFIXES.py
@@ -26,14 +26,12 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import TestSCons
 
-from common import write_fake_link
-
 _python_ = TestSCons._python_
 _exe   = TestSCons._exe
 
 test = TestSCons.TestSCons()
 
-write_fake_link(test)
+test.file_fixture('mylink.py')
 
 test.write('myfortran.py', r"""
 import getopt
diff --git a/test/Fortran/F08FILESUFFIXES2.py b/test/Fortran/F08FILESUFFIXES2.py
index 39bba44..e53cee1 100644
--- a/test/Fortran/F08FILESUFFIXES2.py
+++ b/test/Fortran/F08FILESUFFIXES2.py
@@ -26,14 +26,12 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import TestSCons
 
-from common import write_fake_link
-
 _python_ = TestSCons._python_
 _exe   = TestSCons._exe
 
 test = TestSCons.TestSCons()
 
-write_fake_link(test)
+test.file_fixture('mylink.py')
 
 test.write('myfortran.py', r"""
 import getopt
diff --git a/test/Fortran/F08FLAGS.py b/test/Fortran/F08FLAGS.py
index 866ea2c..34f3d75 100644
--- a/test/Fortran/F08FLAGS.py
+++ b/test/Fortran/F08FLAGS.py
@@ -26,14 +26,12 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import TestSCons
 
-from common import write_fake_link
-
 _python_ = TestSCons._python_
 
 test = TestSCons.TestSCons()
 _exe = TestSCons._exe
 
-write_fake_link(test)
+test.file_fixture('mylink.py')
 
 test.write('myfortran.py', r"""
 import getopt
diff --git a/test/Fortran/F77.py b/test/Fortran/F77.py
index 0ebd7ee..300df85 100644
--- a/test/Fortran/F77.py
+++ b/test/Fortran/F77.py
@@ -26,14 +26,12 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import TestSCons
 
-from common import write_fake_link
-
 _python_ = TestSCons._python_
 _exe   = TestSCons._exe
 
 test = TestSCons.TestSCons()
 
-write_fake_link(test)
+test.file_fixture('mylink.py')
 
 test.write('myfortran.py', r"""
 import getopt
diff --git a/test/Fortran/F77COM.py b/test/Fortran/F77COM.py
index 1efbe05..4e15eea 100644
--- a/test/Fortran/F77COM.py
+++ b/test/Fortran/F77COM.py
@@ -26,14 +26,12 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import TestSCons
 
-from common import write_fake_link
-
 _python_ = TestSCons._python_
 _exe   = TestSCons._exe
 
 test = TestSCons.TestSCons()
 
-write_fake_link(test)
+test.file_fixture('mylink.py')
 
 test.write('myfortran.py', r"""
 import sys
diff --git a/test/Fortran/F77FILESUFFIXES.py b/test/Fortran/F77FILESUFFIXES.py
index 2070ff2..1715ce9 100644
--- a/test/Fortran/F77FILESUFFIXES.py
+++ b/test/Fortran/F77FILESUFFIXES.py
@@ -26,14 +26,12 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import TestSCons
 
-from common import write_fake_link
-
 _python_ = TestSCons._python_
 _exe   = TestSCons._exe
 
 test = TestSCons.TestSCons()
 
-write_fake_link(test)
+test.file_fixture('mylink.py')
 
 test.write('myfortran.py', r"""
 import getopt
diff --git a/test/Fortran/F77FILESUFFIXES2.py b/test/Fortran/F77FILESUFFIXES2.py
index 52e4d68..1938af1 100644
--- a/test/Fortran/F77FILESUFFIXES2.py
+++ b/test/Fortran/F77FILESUFFIXES2.py
@@ -26,14 +26,12 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import TestSCons
 
-from common import write_fake_link
-
 _python_ = TestSCons._python_
 _exe   = TestSCons._exe
 
 test = TestSCons.TestSCons()
 
-write_fake_link(test)
+test.file_fixture('mylink.py')
 
 test.write('myfortran.py', r"""
 import getopt
diff --git a/test/Fortran/F77FLAGS.py b/test/Fortran/F77FLAGS.py
index 342adac..8e972ec 100644
--- a/test/Fortran/F77FLAGS.py
+++ b/test/Fortran/F77FLAGS.py
@@ -26,14 +26,12 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import TestSCons
 
-from common import write_fake_link
-
 _python_ = TestSCons._python_
 
 test = TestSCons.TestSCons()
 _exe = TestSCons._exe
 
-write_fake_link(test)
+test.file_fixture('mylink.py')
 
 test.write('myg77.py', r"""
 import getopt
diff --git a/test/Fortran/F90.py b/test/Fortran/F90.py
index d7c73c6..bbceaac 100644
--- a/test/Fortran/F90.py
+++ b/test/Fortran/F90.py
@@ -26,14 +26,12 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import TestSCons
 
-from common import write_fake_link
-
 _python_ = TestSCons._python_
 _exe   = TestSCons._exe
 
 test = TestSCons.TestSCons()
 
-write_fake_link(test)
+test.file_fixture('mylink.py')
 
 test.write('myfortran.py', r"""
 import getopt
diff --git a/test/Fortran/F90COM.py b/test/Fortran/F90COM.py
index 8981bb3..e3be2a1 100644
--- a/test/Fortran/F90COM.py
+++ b/test/Fortran/F90COM.py
@@ -26,14 +26,12 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import TestSCons
 
-from common import write_fake_link
-
 _python_ = TestSCons._python_
 _exe   = TestSCons._exe
 
 test = TestSCons.TestSCons()
 
-write_fake_link(test)
+test.file_fixture('mylink.py')
 
 test.write('myfortran.py', r"""
 import sys
diff --git a/test/Fortran/F90FILESUFFIXES.py b/test/Fortran/F90FILESUFFIXES.py
index ae61a84..47da08e 100644
--- a/test/Fortran/F90FILESUFFIXES.py
+++ b/test/Fortran/F90FILESUFFIXES.py
@@ -26,14 +26,12 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import TestSCons
 
-from common import write_fake_link
-
 _python_ = TestSCons._python_
 _exe   = TestSCons._exe
 
 test = TestSCons.TestSCons()
 
-write_fake_link(test)
+test.file_fixture('mylink.py')
 
 test.write('myfortran.py', r"""
 import getopt
diff --git a/test/Fortran/F90FILESUFFIXES2.py b/test/Fortran/F90FILESUFFIXES2.py
index ab62ca7..7039530 100644
--- a/test/Fortran/F90FILESUFFIXES2.py
+++ b/test/Fortran/F90FILESUFFIXES2.py
@@ -26,14 +26,12 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import TestSCons
 
-from common import write_fake_link
-
 _python_ = TestSCons._python_
 _exe   = TestSCons._exe
 
 test = TestSCons.TestSCons()
 
-write_fake_link(test)
+test.file_fixture('mylink.py')
 
 test.write('myfortran.py', r"""
 import getopt
diff --git a/test/Fortran/F90FLAGS.py b/test/Fortran/F90FLAGS.py
index f0b3003..8eaa938 100644
--- a/test/Fortran/F90FLAGS.py
+++ b/test/Fortran/F90FLAGS.py
@@ -27,14 +27,14 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import TestSCons
 
-from common import write_fake_link
+
 
 _python_ = TestSCons._python_
 
 test = TestSCons.TestSCons()
 _exe = TestSCons._exe
 
-write_fake_link(test)
+test.file_fixture('mylink.py')
 
 test.write('myfortran.py', r"""
 import getopt
diff --git a/test/Fortran/F95.py b/test/Fortran/F95.py
index e7745b1..56c6edd 100644
--- a/test/Fortran/F95.py
+++ b/test/Fortran/F95.py
@@ -26,14 +26,14 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import TestSCons
 
-from common import write_fake_link
+
 
 _python_ = TestSCons._python_
 _exe   = TestSCons._exe
 
 test = TestSCons.TestSCons()
 
-write_fake_link(test)
+test.file_fixture('mylink.py')
 
 test.write('myfortran.py', r"""
 import getopt
diff --git a/test/Fortran/F95COM.py b/test/Fortran/F95COM.py
index 6ef6eb0..4761635 100644
--- a/test/Fortran/F95COM.py
+++ b/test/Fortran/F95COM.py
@@ -26,14 +26,14 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import TestSCons
 
-from common import write_fake_link
+
 
 _python_ = TestSCons._python_
 _exe   = TestSCons._exe
 
 test = TestSCons.TestSCons()
 
-write_fake_link(test)
+test.file_fixture('mylink.py')
 
 test.write('myfortran.py', r"""
 import sys
diff --git a/test/Fortran/F95FILESUFFIXES.py b/test/Fortran/F95FILESUFFIXES.py
index 119629d..8643a24 100644
--- a/test/Fortran/F95FILESUFFIXES.py
+++ b/test/Fortran/F95FILESUFFIXES.py
@@ -26,14 +26,14 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import TestSCons
 
-from common import write_fake_link
+
 
 _python_ = TestSCons._python_
 _exe   = TestSCons._exe
 
 test = TestSCons.TestSCons()
 
-write_fake_link(test)
+test.file_fixture('mylink.py')
 
 test.write('myfortran.py', r"""
 import getopt
diff --git a/test/Fortran/F95FILESUFFIXES2.py b/test/Fortran/F95FILESUFFIXES2.py
index d89839b..d267a24 100644
--- a/test/Fortran/F95FILESUFFIXES2.py
+++ b/test/Fortran/F95FILESUFFIXES2.py
@@ -26,14 +26,14 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import TestSCons
 
-from common import write_fake_link
+
 
 _python_ = TestSCons._python_
 _exe   = TestSCons._exe
 
 test = TestSCons.TestSCons()
 
-write_fake_link(test)
+test.file_fixture('mylink.py')
 
 test.write('myfortran.py', r"""
 import getopt
diff --git a/test/Fortran/F95FLAGS.py b/test/Fortran/F95FLAGS.py
index 8c3ce09..525b8cc 100644
--- a/test/Fortran/F95FLAGS.py
+++ b/test/Fortran/F95FLAGS.py
@@ -26,14 +26,14 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import TestSCons
 
-from common import write_fake_link
+
 
 _python_ = TestSCons._python_
 
 test = TestSCons.TestSCons()
 _exe = TestSCons._exe
 
-write_fake_link(test)
+test.file_fixture('mylink.py')
 
 test.write('myfortran.py', r"""
 import getopt
diff --git a/test/Fortran/FORTRAN.py b/test/Fortran/FORTRAN.py
index 9a01fa6..c03698f 100644
--- a/test/Fortran/FORTRAN.py
+++ b/test/Fortran/FORTRAN.py
@@ -26,14 +26,14 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import TestSCons
 
-from common import write_fake_link
+
 
 _python_ = TestSCons._python_
 _exe   = TestSCons._exe
 
 test = TestSCons.TestSCons()
 
-write_fake_link(test)
+test.file_fixture('mylink.py')
 
 test.write('myg77.py', r"""
 import getopt
diff --git a/test/Fortran/FORTRANCOM.py b/test/Fortran/FORTRANCOM.py
index 6948b96..bf84d26 100644
--- a/test/Fortran/FORTRANCOM.py
+++ b/test/Fortran/FORTRANCOM.py
@@ -26,14 +26,14 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import TestSCons
 
-from common import write_fake_link
+
 
 _python_ = TestSCons._python_
 _exe   = TestSCons._exe
 
 test = TestSCons.TestSCons()
 
-write_fake_link(test)
+test.file_fixture('mylink.py')
 
 test.write('myfortran.py', r"""
 import sys
diff --git a/test/Fortran/FORTRANFILESUFFIXES.py b/test/Fortran/FORTRANFILESUFFIXES.py
index 92e30ea..e4b6192 100644
--- a/test/Fortran/FORTRANFILESUFFIXES.py
+++ b/test/Fortran/FORTRANFILESUFFIXES.py
@@ -26,14 +26,14 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import TestSCons
 
-from common import write_fake_link
+
 
 _python_ = TestSCons._python_
 _exe   = TestSCons._exe
 
 test = TestSCons.TestSCons()
 
-write_fake_link(test)
+test.file_fixture('mylink.py')
 
 test.write('myfortran.py', r"""
 import getopt
diff --git a/test/Fortran/FORTRANFILESUFFIXES2.py b/test/Fortran/FORTRANFILESUFFIXES2.py
index 8ba0962..79231ac 100644
--- a/test/Fortran/FORTRANFILESUFFIXES2.py
+++ b/test/Fortran/FORTRANFILESUFFIXES2.py
@@ -26,14 +26,14 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import TestSCons
 
-from common import write_fake_link
+
 
 _python_ = TestSCons._python_
 _exe   = TestSCons._exe
 
 test = TestSCons.TestSCons()
 
-write_fake_link(test)
+test.file_fixture('mylink.py')
 
 test.write('myfortran.py', r"""
 import getopt
diff --git a/test/Fortran/FORTRANFLAGS.py b/test/Fortran/FORTRANFLAGS.py
index 150000a..7dbc049 100644
--- a/test/Fortran/FORTRANFLAGS.py
+++ b/test/Fortran/FORTRANFLAGS.py
@@ -26,14 +26,14 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import TestSCons
 
-from common import write_fake_link
+
 
 _python_ = TestSCons._python_
 
 test = TestSCons.TestSCons()
 _exe = TestSCons._exe
 
-write_fake_link(test)
+test.file_fixture('mylink.py')
 
 test.write('myfortran.py', r"""
 import getopt
diff --git a/test/Fortran/FORTRANPPFILESUFFIXES.py b/test/Fortran/FORTRANPPFILESUFFIXES.py
index e0c6974..2791b91 100644
--- a/test/Fortran/FORTRANPPFILESUFFIXES.py
+++ b/test/Fortran/FORTRANPPFILESUFFIXES.py
@@ -30,14 +30,14 @@ import string
 import sys
 import TestSCons
 
-from common import write_fake_link
+
 
 _python_ = TestSCons._python_
 _exe   = TestSCons._exe
 
 test = TestSCons.TestSCons()
 
-write_fake_link(test)
+test.file_fixture('mylink.py')
 
 test.write('myfortran.py', r"""
 import getopt