From 6726c98cda5cfc679cf669f0bd3251fa515842f7 Mon Sep 17 00:00:00 2001 From: stevenknight Date: Sat, 13 Aug 2005 19:36:44 +0000 Subject: [PATCH] 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 --- test/Fortran/F77FLAGS.py | 20 ++++++++++---------- test/Fortran/F90FLAGS.py | 28 ++++++++++++++-------------- test/Fortran/F95FLAGS.py | 28 ++++++++++++++-------------- test/Fortran/FORTRANFLAGS.py | 28 ++++++++++++++-------------- test/Fortran/SHF77FLAGS.py | 20 ++++++++++---------- test/Fortran/SHF90FLAGS.py | 28 ++++++++++++++-------------- test/Fortran/SHF95FLAGS.py | 28 ++++++++++++++-------------- test/Fortran/SHFORTRANFLAGS.py | 28 ++++++++++++++-------------- 8 files changed, 104 insertions(+), 104 deletions(-) diff --git a/test/Fortran/F77FLAGS.py b/test/Fortran/F77FLAGS.py index b1de112e..5aa8044c 100644 --- 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 375df710..3ac5a296 100644 --- 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 1528a320..9d958d4d 100644 --- 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 1bed2d06..a4fb3760 100644 --- 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 1595aee9..263e1a41 100644 --- 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 5bb3f69d..6257adb4 100644 --- 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 f98871cc..f5eb3263 100644 --- 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 2d8c97cc..1e4dc768 100644 --- 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") -- 2.26.2