[Ltp-commits] [Git] ltp updated.

[Garrett C. <ris...@li...>]

The branch, pu, has been updated
       via  094d369f06607e37d76d697844f75272755cf969 (commit)
       via  0df8df0011e170d2644b4cdfef6216030dcb8c50 (commit)
       via  65d6a03b5ce17b934d1fd5a72e8c7519d637965b (commit)
      from  e8d8303f301eb8fd6477346373b8ffe21aed4d09 (commit)


- Log -----------------------------------------------------------------
commit 094d369f06607e37d76d697844f75272755cf969
Author: Garrett Cooper <yan...@gm...>
Date:   Sun Jul 4 23:32:00 2010 -0700

    Simplify include files by cat'ing them.
    
    grep screws up the details and prints out one whitespace separated token
    per line (probably because I wasn't quoting the string), but commenting
    out # can be confusing.
    
    Signed-off-by: Garrett Cooper <yan...@gm...>

commit 0df8df0011e170d2644b4cdfef6216030dcb8c50
Author: Garrett Cooper <yan...@gm...>
Date:   Sun Jul 4 23:28:16 2010 -0700

    Disable -std=g99 detection.
    
    The gcc toolchain has been c99 compliant (for the most part), for quite
    a few years. People should know what their compilers are capable of,
    s.t. adding more logic to detect this functionality (incorrectly) isn't
    really helpful.
    
    Signed-off-by: Garrett Cooper <yan...@gm...>

commit 65d6a03b5ce17b934d1fd5a72e8c7519d637965b
Author: Garrett Cooper <yan...@gm...>
Date:   Sun Jul 4 22:57:17 2010 -0700

    Fix inverted logic (doh!).
    
    Signed-off-by: Garrett Cooper <yan...@gm...>

-----------------------------------------------------------------------

Summary of changes:
 testcases/open_posix_testsuite/CFLAGS              |    2 +-
 .../scripts/generate-makefiles.sh                  |   14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)
 
diff --git a/testcases/open_posix_testsuite/CFLAGS b/testcases/open_posix_testsuite/CFLAGS
index 55563b3..a27d9aa 100644
--- a/testcases/open_posix_testsuite/CFLAGS
+++ b/testcases/open_posix_testsuite/CFLAGS
@@ -1 +1 @@
--std=c99 `$(CC) -std=gnu99 -S -o /dev/null -xc /dev/null >/dev/null 2>&1 && echo "-std=gnu99"` -D_POSIX_C_SOURCE=200112L -D_XOPEN_SOURCE=600
+-std=c99 -D_POSIX_C_SOURCE=200112L -D_XOPEN_SOURCE=600
diff --git a/testcases/open_posix_testsuite/scripts/generate-makefiles.sh b/testcases/open_posix_testsuite/scripts/generate-makefiles.sh
index 710e774..85cf00d 100755
--- a/testcases/open_posix_testsuite/scripts/generate-makefiles.sh
+++ b/testcases/open_posix_testsuite/scripts/generate-makefiles.sh
@@ -55,7 +55,7 @@ generate_makefile() {
 		fi
 	done
 
-	if [ -f "$makefile.1" ]; then
+	if [ ! -f "$makefile.1" ]; then
 
 		cat > "$makefile.1" <<EOF
 #
@@ -83,14 +83,14 @@ CFLAGS+=		-I\$(top_srcdir)/include
 CFLAGS+=		-I\$(srcdir)
 
 # Include top-level make definitions and submake make definitions.
-CFLAGS+=		\`grep -v '^#' 2>/dev/null \$(top_srcdir)/CFLAGS\`
-CFLAGS+=		\`grep -v '^#' 2>/dev/null \$(srcdir)/CFLAGS\`
+CFLAGS+=		\`cat 2>/dev/null \$(top_srcdir)/CFLAGS\`
+CFLAGS+=		\`cat 2>/dev/null \$(srcdir)/CFLAGS\`
 
-LDFLAGS+=		\`grep -v '^#' 2>/dev/null \$(top_srcdir)/LDFLAGS\`
-LDFLAGS+=		\`grep -v '^#' 2>/dev/null \$(srcdir)/LDFLAGS\`
+LDFLAGS+=		\`cat 2>/dev/null \$(top_srcdir)/LDFLAGS\`
+LDFLAGS+=		\`cat 2>/dev/null \$(srcdir)/LDFLAGS\`
 
-LDLIBS+=		\`grep -v '^#' 2>/dev/null \$(top_srcdir)/LDLIBS\`
-LDLIBS+=		\`grep -v '^#' 2>/dev/null \$(srcdir)/LDLIBS\`
+LDLIBS+=		\`cat 2>/dev/null \$(top_srcdir)/LDLIBS\`
+LDLIBS+=		\`cat 2>/dev/null \$(srcdir)/LDLIBS\`
 
 EOF
 


hooks/post-receive
-- 
ltp