[PATCH 0/2] minor patches to cthon tests for gcc 4.0

[PATCH 0/2] minor patches to cthon tests for gcc 4.0

[Jim Rees]

First patch adds some generated files to .gitignore.  Second removes
-fwritable-strings from the COPTS for gcc 4.0.

Jim Rees (2):
  add generated .c files to .gitignore
  remove -fwritable-strings for gcc 4.0

 .gitignore |    3 +++
 tests.init |    7 +++++++
 2 files changed, 10 insertions(+), 0 deletions(-)

-- 
1.7.4.1

[PATCH 1/2] add generated .c files to .gitignore

[Jim Rees]

Signed-off-by: Jim Rees <rees@umich.edu>
---
 .gitignore |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/.gitignore b/.gitignore
index f96c819..b8792d0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,6 +15,9 @@ basic/test8
 basic/test9
 domount
 getopt
+general/large1.c
+general/large2.c
+general/large3.c
 lock/tlock64
 lock/tlocklfs
 special/bigfile
-- 
1.7.4.1

Re: [PATCH 1/2] add generated .c files to .gitignore

[Steve Dickson]

On 06/16/2011 12:23 PM, Jim Rees wrote:
> Signed-off-by: Jim Rees <rees@umich.edu>
> ---
>  .gitignore |    3 +++
>  1 files changed, 3 insertions(+), 0 deletions(-)
> 
> diff --git a/.gitignore b/.gitignore
> index f96c819..b8792d0 100644
> --- a/.gitignore
> +++ b/.gitignore
> @@ -15,6 +15,9 @@ basic/test8
>  basic/test9
>  domount
>  getopt
> +general/large1.c
> +general/large2.c
> +general/large3.c
>  lock/tlock64
>  lock/tlocklfs
>  special/bigfile
Committed on the git://linux-nfs.org/~steved/exports/cthon04 tree

steved.

[PATCH 2/2] remove -fwritable-strings for gcc 4.0

[Jim Rees]

Signed-off-by: Jim Rees <rees@umich.edu>
---
 tests.init |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/tests.init b/tests.init
index 69b51bf..5d93eb5 100644
--- a/tests.init
+++ b/tests.init
@@ -210,6 +210,13 @@ LOCKTESTS=`echo tlocklfs tlock64`
 #UMOUNT=/bin/umount
 #LOCKTESTS=`echo tlocklfs tlock64`
 
+# Use with Linux 2.6 / gcc 4.0
+CFLAGS=`echo -DLINUX -DGLIBC=22 -DMMAP -DSTDARG`
+LIBS=`echo -lnsl`
+MOUNT=/bin/mount
+UMOUNT=/bin/umount
+LOCKTESTS=`echo tlocklfs tlock64`
+
 # Use with Linux if your distro doesn't provide a "cc".
 #CC=gcc
 
-- 
1.7.4.1

Re: [PATCH 2/2] remove -fwritable-strings for gcc 4.0

[Jim Rees]

Jim Rees wrote:

  Signed-off-by: Jim Rees <rees@umich.edu>
  ---
   tests.init |    7 +++++++
   1 files changed, 7 insertions(+), 0 deletions(-)
  
  diff --git a/tests.init b/tests.init
  index 69b51bf..5d93eb5 100644
  --- a/tests.init
  +++ b/tests.init
  @@ -210,6 +210,13 @@ LOCKTESTS=`echo tlocklfs tlock64`
   #UMOUNT=/bin/umount
   #LOCKTESTS=`echo tlocklfs tlock64`
   
  +# Use with Linux 2.6 / gcc 4.0
  +CFLAGS=`echo -DLINUX -DGLIBC=22 -DMMAP -DSTDARG`
  +LIBS=`echo -lnsl`
  +MOUNT=/bin/mount
  +UMOUNT=/bin/umount
  +LOCKTESTS=`echo tlocklfs tlock64`
  +
   # Use with Linux if your distro doesn't provide a "cc".
   #CC=gcc

I guess those lines should actually be commented out.

Re: [PATCH 2/2] remove -fwritable-strings for gcc 4.0

[Steve Dickson]

On 06/16/2011 12:23 PM, Jim Rees wrote:
> Signed-off-by: Jim Rees <rees@umich.edu>
> ---
>  tests.init |    7 +++++++
>  1 files changed, 7 insertions(+), 0 deletions(-)
> 
> diff --git a/tests.init b/tests.init
> index 69b51bf..5d93eb5 100644
> --- a/tests.init
> +++ b/tests.init
> @@ -210,6 +210,13 @@ LOCKTESTS=`echo tlocklfs tlock64`
>  #UMOUNT=/bin/umount
>  #LOCKTESTS=`echo tlocklfs tlock64`
>  
> +# Use with Linux 2.6 / gcc 4.0
> +CFLAGS=`echo -DLINUX -DGLIBC=22 -DMMAP -DSTDARG`
> +LIBS=`echo -lnsl`
> +MOUNT=/bin/mount
> +UMOUNT=/bin/umount
> +LOCKTESTS=`echo tlocklfs tlock64`
> +
>  # Use with Linux if your distro doesn't provide a "cc".
>  #CC=gcc
>  
Committed on the git://linux-nfs.org/~steved/exports/cthon04 tree

steved.