Skip to contentSkip to conversation

minor patches to cthon tests for gcc 4.0

PATCH In review Jim Rees 2 participants 6 messages Jun 16, 2011 – Jun 27, 2011

Subsystems (2)
lore
Share & tools
lore

Jim Rees

author
#0 lore raw

cover minor patches to cthon tests for gcc 4.0

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(-)
Signature · 1 line
1.7.4.1
author
#1 lore raw

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

---
 .gitignore |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
.gitignore +3 -0
index f96c819..b8792d0 100644
@@ -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
Signature · 1 line
1.7.4.1
#2 lore raw

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

Quoted 10 lines · Jim Rees
---
 .gitignore |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
.gitignore +0 -0
index f96c819..b8792d0 100644

.gitignore basic/test8 · line 23

Quoted 9 lines
.gitignore +3 -0
@@ -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.

author
#3 lore raw

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

In reply to Jim Rees
---
 tests.init |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)
tests.init +7 -0
index 69b51bf..5d93eb5 100644
@@ -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
 
Signature · 1 line
1.7.4.1
author
#4 lore raw

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

Jim Rees wrote:

---

   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.

#5 lore raw

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

In reply to Jim Rees
Quoted 13 lines · Jim Rees
---
 tests.init |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)
tests.init +0 -0
index 69b51bf..5d93eb5 100644
@@ -210,6 +210,13 @@ LOCKTESTS=`echo tlocklfs tlock64`
 #UMOUNT=/bin/umount
 #LOCKTESTS=`echo tlocklfs tlock64`
 

tests.init LOCKTESTS=`echo tlocklfs tlock64` · line 222

Quoted 10 lines
tests.init +7 -0
+# 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.