Update Fortran tests that relied on the order of the -c option.

git-svn-id: http://scons.tigris.org/svn/scons/trunk@1330 fdb21ef1-2011-0410-befe-b5e4ea1792b1

diff --git a/test/Fortran/F77FLAGS.py b/test/Fortran/F77FLAGS.py
index b1de112e1c59bca37baeac835286a37fb78d5fa4..5aa8044c440e9e64b819a88c8d5df6d5505facab 100644 (file)
--- a/test/Fortran/F77FLAGS.py
+++ b/test/Fortran/F77FLAGS.py
@@ -119,16 +119,16 @@ test.write('test10.F77', "This is a .F77 file.\n#link\n#g77\n")
 
 test.run(arguments = '.', stderr = None)
 
-test.must_match('test01' + _exe, " -x -c\nThis is a .f file.\n")
-test.must_match('test02' + _exe, " -x -c\nThis is a .F file.\n")
-test.must_match('test03' + _exe, " -x -c\nThis is a .for file.\n")
-test.must_match('test04' + _exe, " -x -c\nThis is a .FOR file.\n")
-test.must_match('test05' + _exe, " -x -c\nThis is a .ftn file.\n")
-test.must_match('test06' + _exe, " -x -c\nThis is a .FTN file.\n")
-test.must_match('test07' + _exe, " -x -c\nThis is a .fpp file.\n")
-test.must_match('test08' + _exe, " -x -c\nThis is a .FPP file.\n")
-test.must_match('test09' + _exe, " -x -c\nThis is a .f77 file.\n")
-test.must_match('test10' + _exe, " -x -c\nThis is a .F77 file.\n")
+test.must_match('test01' + _exe, " -c -x\nThis is a .f file.\n")
+test.must_match('test02' + _exe, " -c -x\nThis is a .F file.\n")
+test.must_match('test03' + _exe, " -c -x\nThis is a .for file.\n")
+test.must_match('test04' + _exe, " -c -x\nThis is a .FOR file.\n")
+test.must_match('test05' + _exe, " -c -x\nThis is a .ftn file.\n")
+test.must_match('test06' + _exe, " -c -x\nThis is a .FTN file.\n")
+test.must_match('test07' + _exe, " -c -x\nThis is a .fpp file.\n")
+test.must_match('test08' + _exe, " -c -x\nThis is a .FPP file.\n")
+test.must_match('test09' + _exe, " -c -x\nThis is a .f77 file.\n")
+test.must_match('test10' + _exe, " -c -x\nThis is a .F77 file.\n")
 
 
 

diff --git a/test/Fortran/F90FLAGS.py b/test/Fortran/F90FLAGS.py
index 375df7109d06f653b2d09b9211ba5a1fa81bcfda..3ac5a29681cf6bee97a5e212cd1b25abe7192235 100644 (file)
--- a/test/Fortran/F90FLAGS.py
+++ b/test/Fortran/F90FLAGS.py
@@ -130,20 +130,20 @@ test.write('test14.F95', "This is a .F95 file.\n#link\n#fortran\n")
 
 test.run(arguments = '.', stderr = None)
 
-test.must_match('test01' + _exe, " -y -c\nThis is a .f file.\n")
-test.must_match('test02' + _exe, " -y -c\nThis is a .F file.\n")
-test.must_match('test03' + _exe, " -y -c\nThis is a .for file.\n")
-test.must_match('test04' + _exe, " -y -c\nThis is a .FOR file.\n")
-test.must_match('test05' + _exe, " -y -c\nThis is a .ftn file.\n")
-test.must_match('test06' + _exe, " -y -c\nThis is a .FTN file.\n")
-test.must_match('test07' + _exe, " -y -c\nThis is a .fpp file.\n")
-test.must_match('test08' + _exe, " -y -c\nThis is a .FPP file.\n")
-test.must_match('test09' + _exe, " -y -c\nThis is a .f77 file.\n")
-test.must_match('test10' + _exe, " -y -c\nThis is a .F77 file.\n")
-test.must_match('test11' + _exe, " -x -c\nThis is a .f90 file.\n")
-test.must_match('test12' + _exe, " -x -c\nThis is a .F90 file.\n")
-test.must_match('test13' + _exe, " -y -c\nThis is a .f95 file.\n")
-test.must_match('test14' + _exe, " -y -c\nThis is a .F95 file.\n")
+test.must_match('test01' + _exe, " -c -y\nThis is a .f file.\n")
+test.must_match('test02' + _exe, " -c -y\nThis is a .F file.\n")
+test.must_match('test03' + _exe, " -c -y\nThis is a .for file.\n")
+test.must_match('test04' + _exe, " -c -y\nThis is a .FOR file.\n")
+test.must_match('test05' + _exe, " -c -y\nThis is a .ftn file.\n")
+test.must_match('test06' + _exe, " -c -y\nThis is a .FTN file.\n")
+test.must_match('test07' + _exe, " -c -y\nThis is a .fpp file.\n")
+test.must_match('test08' + _exe, " -c -y\nThis is a .FPP file.\n")
+test.must_match('test09' + _exe, " -c -y\nThis is a .f77 file.\n")
+test.must_match('test10' + _exe, " -c -y\nThis is a .F77 file.\n")
+test.must_match('test11' + _exe, " -c -x\nThis is a .f90 file.\n")
+test.must_match('test12' + _exe, " -c -x\nThis is a .F90 file.\n")
+test.must_match('test13' + _exe, " -c -y\nThis is a .f95 file.\n")
+test.must_match('test14' + _exe, " -c -y\nThis is a .F95 file.\n")
 
 
 

diff --git a/test/Fortran/F95FLAGS.py b/test/Fortran/F95FLAGS.py
index 1528a320b80763f6c43e4bf1215cae0a6da1bcc2..9d958d4df96476715b824a0d36d1035797195a39 100644 (file)
--- a/test/Fortran/F95FLAGS.py
+++ b/test/Fortran/F95FLAGS.py
@@ -130,20 +130,20 @@ test.write('test14.F95', "This is a .F95 file.\n#link\n#g95\n")
 
 test.run(arguments = '.', stderr = None)
 
-test.must_match('test01' + _exe, " -y -c\nThis is a .f file.\n")
-test.must_match('test02' + _exe, " -y -c\nThis is a .F file.\n")
-test.must_match('test03' + _exe, " -y -c\nThis is a .for file.\n")
-test.must_match('test04' + _exe, " -y -c\nThis is a .FOR file.\n")
-test.must_match('test05' + _exe, " -y -c\nThis is a .ftn file.\n")
-test.must_match('test06' + _exe, " -y -c\nThis is a .FTN file.\n")
-test.must_match('test07' + _exe, " -y -c\nThis is a .fpp file.\n")
-test.must_match('test08' + _exe, " -y -c\nThis is a .FPP file.\n")
-test.must_match('test09' + _exe, " -y -c\nThis is a .f77 file.\n")
-test.must_match('test10' + _exe, " -y -c\nThis is a .F77 file.\n")
-test.must_match('test11' + _exe, " -y -c\nThis is a .f90 file.\n")
-test.must_match('test12' + _exe, " -y -c\nThis is a .F90 file.\n")
-test.must_match('test13' + _exe, " -x -c\nThis is a .f95 file.\n")
-test.must_match('test14' + _exe, " -x -c\nThis is a .F95 file.\n")
+test.must_match('test01' + _exe, " -c -y\nThis is a .f file.\n")
+test.must_match('test02' + _exe, " -c -y\nThis is a .F file.\n")
+test.must_match('test03' + _exe, " -c -y\nThis is a .for file.\n")
+test.must_match('test04' + _exe, " -c -y\nThis is a .FOR file.\n")
+test.must_match('test05' + _exe, " -c -y\nThis is a .ftn file.\n")
+test.must_match('test06' + _exe, " -c -y\nThis is a .FTN file.\n")
+test.must_match('test07' + _exe, " -c -y\nThis is a .fpp file.\n")
+test.must_match('test08' + _exe, " -c -y\nThis is a .FPP file.\n")
+test.must_match('test09' + _exe, " -c -y\nThis is a .f77 file.\n")
+test.must_match('test10' + _exe, " -c -y\nThis is a .F77 file.\n")
+test.must_match('test11' + _exe, " -c -y\nThis is a .f90 file.\n")
+test.must_match('test12' + _exe, " -c -y\nThis is a .F90 file.\n")
+test.must_match('test13' + _exe, " -c -x\nThis is a .f95 file.\n")
+test.must_match('test14' + _exe, " -c -x\nThis is a .F95 file.\n")
 
 
 

diff --git a/test/Fortran/FORTRANFLAGS.py b/test/Fortran/FORTRANFLAGS.py
index 1bed2d0613adbbf805066179298d9e33ba0282b0..a4fb37604102f257eb187ec4050f840917df758f 100644 (file)
--- a/test/Fortran/FORTRANFLAGS.py
+++ b/test/Fortran/FORTRANFLAGS.py
@@ -127,20 +127,20 @@ test.write('test14.F95', "This is a .F95 file.\n#link\n#fortran\n")
 
 test.run(arguments = '.', stderr = None)
 
-test.must_match('test01' + _exe, " -x -c\nThis is a .f file.\n")
-test.must_match('test02' + _exe, " -x -c\nThis is a .F file.\n")
-test.must_match('test03' + _exe, " -x -c\nThis is a .for file.\n")
-test.must_match('test04' + _exe, " -x -c\nThis is a .FOR file.\n")
-test.must_match('test05' + _exe, " -x -c\nThis is a .ftn file.\n")
-test.must_match('test06' + _exe, " -x -c\nThis is a .FTN file.\n")
-test.must_match('test07' + _exe, " -x -c\nThis is a .fpp file.\n")
-test.must_match('test08' + _exe, " -x -c\nThis is a .FPP file.\n")
-test.must_match('test09' + _exe, " -x -c\nThis is a .f77 file.\n")
-test.must_match('test10' + _exe, " -x -c\nThis is a .F77 file.\n")
-test.must_match('test11' + _exe, " -x -c\nThis is a .f90 file.\n")
-test.must_match('test12' + _exe, " -x -c\nThis is a .F90 file.\n")
-test.must_match('test13' + _exe, " -x -c\nThis is a .f95 file.\n")
-test.must_match('test14' + _exe, " -x -c\nThis is a .F95 file.\n")
+test.must_match('test01' + _exe, " -c -x\nThis is a .f file.\n")
+test.must_match('test02' + _exe, " -c -x\nThis is a .F file.\n")
+test.must_match('test03' + _exe, " -c -x\nThis is a .for file.\n")
+test.must_match('test04' + _exe, " -c -x\nThis is a .FOR file.\n")
+test.must_match('test05' + _exe, " -c -x\nThis is a .ftn file.\n")
+test.must_match('test06' + _exe, " -c -x\nThis is a .FTN file.\n")
+test.must_match('test07' + _exe, " -c -x\nThis is a .fpp file.\n")
+test.must_match('test08' + _exe, " -c -x\nThis is a .FPP file.\n")
+test.must_match('test09' + _exe, " -c -x\nThis is a .f77 file.\n")
+test.must_match('test10' + _exe, " -c -x\nThis is a .F77 file.\n")
+test.must_match('test11' + _exe, " -c -x\nThis is a .f90 file.\n")
+test.must_match('test12' + _exe, " -c -x\nThis is a .F90 file.\n")
+test.must_match('test13' + _exe, " -c -x\nThis is a .f95 file.\n")
+test.must_match('test14' + _exe, " -c -x\nThis is a .F95 file.\n")
 
 
 

diff --git a/test/Fortran/SHF77FLAGS.py b/test/Fortran/SHF77FLAGS.py
index 1595aee90b3e881a822736d0373a6af6f45316e0..263e1a4102d02fa0b811b4a881d4dd212884891f 100644 (file)
--- a/test/Fortran/SHF77FLAGS.py
+++ b/test/Fortran/SHF77FLAGS.py
@@ -90,16 +90,16 @@ test.write('test10.F77', "This is a .F77 file.\n#g77\n")
 
 test.run(arguments = '.', stderr = None)
 
-test.must_match('test01' + _obj, " -x -c\nThis is a .f file.\n")
-test.must_match('test02' + _obj, " -x -c\nThis is a .F file.\n")
-test.must_match('test03' + _obj, " -x -c\nThis is a .for file.\n")
-test.must_match('test04' + _obj, " -x -c\nThis is a .FOR file.\n")
-test.must_match('test05' + _obj, " -x -c\nThis is a .ftn file.\n")
-test.must_match('test06' + _obj, " -x -c\nThis is a .FTN file.\n")
-test.must_match('test07' + _obj, " -x -c\nThis is a .fpp file.\n")
-test.must_match('test08' + _obj, " -x -c\nThis is a .FPP file.\n")
-test.must_match('test09' + _obj, " -x -c\nThis is a .f77 file.\n")
-test.must_match('test10' + _obj, " -x -c\nThis is a .F77 file.\n")
+test.must_match('test01' + _obj, " -c -x\nThis is a .f file.\n")
+test.must_match('test02' + _obj, " -c -x\nThis is a .F file.\n")
+test.must_match('test03' + _obj, " -c -x\nThis is a .for file.\n")
+test.must_match('test04' + _obj, " -c -x\nThis is a .FOR file.\n")
+test.must_match('test05' + _obj, " -c -x\nThis is a .ftn file.\n")
+test.must_match('test06' + _obj, " -c -x\nThis is a .FTN file.\n")
+test.must_match('test07' + _obj, " -c -x\nThis is a .fpp file.\n")
+test.must_match('test08' + _obj, " -c -x\nThis is a .FPP file.\n")
+test.must_match('test09' + _obj, " -c -x\nThis is a .f77 file.\n")
+test.must_match('test10' + _obj, " -c -x\nThis is a .F77 file.\n")
 
 
 

diff --git a/test/Fortran/SHF90FLAGS.py b/test/Fortran/SHF90FLAGS.py
index 5bb3f69de1493c8f22bfc126240dcad3130434c1..6257adb4fbca31a725a828c14dd8bc438109d50c 100644 (file)
--- a/test/Fortran/SHF90FLAGS.py
+++ b/test/Fortran/SHF90FLAGS.py
@@ -101,20 +101,20 @@ test.write('test14.F95', "This is a .F95 file.\n#fortran\n")
 
 test.run(arguments = '.', stderr = None)
 
-test.must_match('test01' + _obj, " -y -c\nThis is a .f file.\n")
-test.must_match('test02' + _obj, " -y -c\nThis is a .F file.\n")
-test.must_match('test03' + _obj, " -y -c\nThis is a .for file.\n")
-test.must_match('test04' + _obj, " -y -c\nThis is a .FOR file.\n")
-test.must_match('test05' + _obj, " -y -c\nThis is a .ftn file.\n")
-test.must_match('test06' + _obj, " -y -c\nThis is a .FTN file.\n")
-test.must_match('test07' + _obj, " -y -c\nThis is a .fpp file.\n")
-test.must_match('test08' + _obj, " -y -c\nThis is a .FPP file.\n")
-test.must_match('test09' + _obj, " -y -c\nThis is a .f77 file.\n")
-test.must_match('test10' + _obj, " -y -c\nThis is a .F77 file.\n")
-test.must_match('test11' + _obj, " -x -c\nThis is a .f90 file.\n")
-test.must_match('test12' + _obj, " -x -c\nThis is a .F90 file.\n")
-test.must_match('test13' + _obj, " -y -c\nThis is a .f95 file.\n")
-test.must_match('test14' + _obj, " -y -c\nThis is a .F95 file.\n")
+test.must_match('test01' + _obj, " -c -y\nThis is a .f file.\n")
+test.must_match('test02' + _obj, " -c -y\nThis is a .F file.\n")
+test.must_match('test03' + _obj, " -c -y\nThis is a .for file.\n")
+test.must_match('test04' + _obj, " -c -y\nThis is a .FOR file.\n")
+test.must_match('test05' + _obj, " -c -y\nThis is a .ftn file.\n")
+test.must_match('test06' + _obj, " -c -y\nThis is a .FTN file.\n")
+test.must_match('test07' + _obj, " -c -y\nThis is a .fpp file.\n")
+test.must_match('test08' + _obj, " -c -y\nThis is a .FPP file.\n")
+test.must_match('test09' + _obj, " -c -y\nThis is a .f77 file.\n")
+test.must_match('test10' + _obj, " -c -y\nThis is a .F77 file.\n")
+test.must_match('test11' + _obj, " -c -x\nThis is a .f90 file.\n")
+test.must_match('test12' + _obj, " -c -x\nThis is a .F90 file.\n")
+test.must_match('test13' + _obj, " -c -y\nThis is a .f95 file.\n")
+test.must_match('test14' + _obj, " -c -y\nThis is a .F95 file.\n")
 
 
 

diff --git a/test/Fortran/SHF95FLAGS.py b/test/Fortran/SHF95FLAGS.py
index f98871cc5582df42a933425f9f9c38b58ea62350..f5eb3263366e5f0a2105e8a4fcbbb7c64a18df5c 100644 (file)
--- a/test/Fortran/SHF95FLAGS.py
+++ b/test/Fortran/SHF95FLAGS.py
@@ -101,20 +101,20 @@ test.write('test14.F95', "This is a .F95 file.\n#g95\n")
 
 test.run(arguments = '.', stderr = None)
 
-test.must_match('test01' + _obj, " -y -c\nThis is a .f file.\n")
-test.must_match('test02' + _obj, " -y -c\nThis is a .F file.\n")
-test.must_match('test03' + _obj, " -y -c\nThis is a .for file.\n")
-test.must_match('test04' + _obj, " -y -c\nThis is a .FOR file.\n")
-test.must_match('test05' + _obj, " -y -c\nThis is a .ftn file.\n")
-test.must_match('test06' + _obj, " -y -c\nThis is a .FTN file.\n")
-test.must_match('test07' + _obj, " -y -c\nThis is a .fpp file.\n")
-test.must_match('test08' + _obj, " -y -c\nThis is a .FPP file.\n")
-test.must_match('test09' + _obj, " -y -c\nThis is a .f77 file.\n")
-test.must_match('test10' + _obj, " -y -c\nThis is a .F77 file.\n")
-test.must_match('test11' + _obj, " -y -c\nThis is a .f90 file.\n")
-test.must_match('test12' + _obj, " -y -c\nThis is a .F90 file.\n")
-test.must_match('test13' + _obj, " -x -c\nThis is a .f95 file.\n")
-test.must_match('test14' + _obj, " -x -c\nThis is a .F95 file.\n")
+test.must_match('test01' + _obj, " -c -y\nThis is a .f file.\n")
+test.must_match('test02' + _obj, " -c -y\nThis is a .F file.\n")
+test.must_match('test03' + _obj, " -c -y\nThis is a .for file.\n")
+test.must_match('test04' + _obj, " -c -y\nThis is a .FOR file.\n")
+test.must_match('test05' + _obj, " -c -y\nThis is a .ftn file.\n")
+test.must_match('test06' + _obj, " -c -y\nThis is a .FTN file.\n")
+test.must_match('test07' + _obj, " -c -y\nThis is a .fpp file.\n")
+test.must_match('test08' + _obj, " -c -y\nThis is a .FPP file.\n")
+test.must_match('test09' + _obj, " -c -y\nThis is a .f77 file.\n")
+test.must_match('test10' + _obj, " -c -y\nThis is a .F77 file.\n")
+test.must_match('test11' + _obj, " -c -y\nThis is a .f90 file.\n")
+test.must_match('test12' + _obj, " -c -y\nThis is a .F90 file.\n")
+test.must_match('test13' + _obj, " -c -x\nThis is a .f95 file.\n")
+test.must_match('test14' + _obj, " -c -x\nThis is a .F95 file.\n")
 
 
 

diff --git a/test/Fortran/SHFORTRANFLAGS.py b/test/Fortran/SHFORTRANFLAGS.py
index 2d8c97ccbe204e74028060d8404b856ca492c90e..1e4dc7684e87ed83472b5905d320ca65059049b9 100644 (file)
--- a/test/Fortran/SHFORTRANFLAGS.py
+++ b/test/Fortran/SHFORTRANFLAGS.py
@@ -98,20 +98,20 @@ test.write('test14.F95', "This is a .F95 file.\n#fortran\n")
 
 test.run(arguments = '.', stderr = None)
 
-test.must_match('test01' + _obj, " -x -c\nThis is a .f file.\n")
-test.must_match('test02' + _obj, " -x -c\nThis is a .F file.\n")
-test.must_match('test03' + _obj, " -x -c\nThis is a .for file.\n")
-test.must_match('test04' + _obj, " -x -c\nThis is a .FOR file.\n")
-test.must_match('test05' + _obj, " -x -c\nThis is a .ftn file.\n")
-test.must_match('test06' + _obj, " -x -c\nThis is a .FTN file.\n")
-test.must_match('test07' + _obj, " -x -c\nThis is a .fpp file.\n")
-test.must_match('test08' + _obj, " -x -c\nThis is a .FPP file.\n")
-test.must_match('test09' + _obj, " -x -c\nThis is a .f77 file.\n")
-test.must_match('test10' + _obj, " -x -c\nThis is a .F77 file.\n")
-test.must_match('test11' + _obj, " -x -c\nThis is a .f90 file.\n")
-test.must_match('test12' + _obj, " -x -c\nThis is a .F90 file.\n")
-test.must_match('test13' + _obj, " -x -c\nThis is a .f95 file.\n")
-test.must_match('test14' + _obj, " -x -c\nThis is a .F95 file.\n")
+test.must_match('test01' + _obj, " -c -x\nThis is a .f file.\n")
+test.must_match('test02' + _obj, " -c -x\nThis is a .F file.\n")
+test.must_match('test03' + _obj, " -c -x\nThis is a .for file.\n")
+test.must_match('test04' + _obj, " -c -x\nThis is a .FOR file.\n")
+test.must_match('test05' + _obj, " -c -x\nThis is a .ftn file.\n")
+test.must_match('test06' + _obj, " -c -x\nThis is a .FTN file.\n")
+test.must_match('test07' + _obj, " -c -x\nThis is a .fpp file.\n")
+test.must_match('test08' + _obj, " -c -x\nThis is a .FPP file.\n")
+test.must_match('test09' + _obj, " -c -x\nThis is a .f77 file.\n")
+test.must_match('test10' + _obj, " -c -x\nThis is a .F77 file.\n")
+test.must_match('test11' + _obj, " -c -x\nThis is a .f90 file.\n")
+test.must_match('test12' + _obj, " -c -x\nThis is a .F90 file.\n")
+test.must_match('test13' + _obj, " -c -x\nThis is a .f95 file.\n")
+test.must_match('test14' + _obj, " -c -x\nThis is a .F95 file.\n")