rpms/libhugetlbfs/devel skip-link-tests.diff,1.1,1.2

Steve Fox (drfickle) fedora-extras-commits at redhat.com
Wed Aug 29 02:07:50 UTC 2007


Author: drfickle

Update of /cvs/extras/rpms/libhugetlbfs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19611

Modified Files:
	skip-link-tests.diff 
Log Message:
regenerate patch to apply on top of patch0

skip-link-tests.diff:

Index: skip-link-tests.diff
===================================================================
RCS file: /cvs/extras/rpms/libhugetlbfs/devel/skip-link-tests.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- skip-link-tests.diff	29 Aug 2007 01:41:15 -0000	1.1
+++ skip-link-tests.diff	29 Aug 2007 02:07:47 -0000	1.2
@@ -1,25 +1,24 @@
---- libhugetlbfs-1.1.orig/tests/Makefile	2007-08-28 20:35:24.000000000 -0500
-+++ libhugetlbfs-1.1/tests/Makefile	2007-08-28 20:37:04.000000000 -0500
-@@ -10,8 +10,6 @@
+--- libhugetlbfs-1.1.orig/tests/Makefile	2007-08-28 21:05:34.000000000 -0500
++++ libhugetlbfs-1.1/tests/Makefile	2007-08-28 21:05:57.000000000 -0500
+@@ -10,7 +10,6 @@
  LIB_TESTS_64 = straddle_4GB huge_at_4GB_normal_below \
  	huge_below_4GB_normal_above
  NOLIB_TESTS = malloc malloc_manysmall dummy
--LDSCRIPT_TESTS = zero_filesize_segment
 -HUGELINK_TESTS = linkhuge linkhuge_nofd linkshare
  STRESS_TESTS = mmap-gettest mmap-cow shm-gettest shm-getraw shm-fork
  HELPERS = get_hugetlbfs_path
  
-@@ -22,8 +20,7 @@
+@@ -21,8 +20,7 @@
  LDFLAGS64 = -L../obj64
  INSTALL = install
  
--TESTS = $(LIB_TESTS) $(NOLIB_TESTS) $(LDSCRIPT_TESTS) $(HUGELINK_TESTS) \
+-TESTS = $(LIB_TESTS) $(NOLIB_TESTS) $(HUGELINK_TESTS) \
 -	$(HUGELINK_TESTS:%=xB.%) $(HUGELINK_TESTS:%=xBDT.%) \
 +TESTS = $(LIB_TESTS) $(NOLIB_TESTS) \
  	$(STRESS_TESTS)
  
  TESTS_64 = $(LIB_TESTS_64)
-@@ -44,7 +41,7 @@
+@@ -43,7 +41,7 @@
  .SILENT:
  endif
  
@@ -28,18 +27,10 @@
  	$(HELPERS:%=%.d) testutils.d
  
  ALLTESTS = $(foreach DIR,$(OBJDIRS),$(TESTS:%=$(DIR)/%))
-@@ -81,22 +78,6 @@
+@@ -80,14 +78,6 @@
  	@$(VECHO) LD64 "(nolib test)" $@
  	$(CC64) $(LDFLAGS) $(LDFLAGS64) -o $@ $^ $(LDLIBS)
  
--$(LDSCRIPT_TESTS:%=obj32/%): obj32/%: %.ld obj32/dummy.o obj32/testutils.o
--	@$(VECHO) LD32 "(preload test)" $@
--	$(CC32) $(LDFLAGS) $(LDFLAGS32) -o $@ -Lobj32 $< $(LDLIBS)
--
--$(LDSCRIPT_TESTS:%=obj64/%): obj64/%: %.ld obj64/dummy.o obj64/testutils.o
--	@$(VECHO) LD64 "(preload test)" $@
--	$(CC64) $(LDFLAGS) $(LDFLAGS64) -o $@ -Lobj64 $< $(LDLIBS)
--
 -$(HUGELINK_TESTS:%=obj32/%): %: %.o obj32/testutils.o
 -	@$(VECHO) LD32 "(hugelink test)" $@
 -	$(CC32) $(LDFLAGS) $(LDFLAGS32) -o $@ $^ $(LDLIBS)




More information about the scm-commits mailing list