Fully wire up the upstream testsuite.

(Portage version: 2.2_rc48/cvs/Linux x86_64)

1 files changed, 49 insertions, 0 deletions

diff --git a/sys-libs/libhugetlbfs/files/libhugetlbfs-2.6-fixup-testsuite.patch b/sys-libs/libhugetlbfs/files/libhugetlbfs-2.6-fixup-testsuite.patch
new file mode 100644
index 000000000000..de8fed17c475
--- /dev/null
+++ b/sys-libs/libhugetlbfs/files/libhugetlbfs-2.6-fixup-testsuite.patch
@@ -0,0 +1,49 @@
+diff -Nuar --exclude '*.S' --exclude Makefile libhugetlbfs-2.6.orig/tests/run_tests.py libhugetlbfs-2.6/tests/run_tests.py
+--- libhugetlbfs-2.6.orig/tests/run_tests.py	2009-08-24 05:56:07.000000000 -0700
++++ libhugetlbfs-2.6/tests/run_tests.py	2009-10-31 00:40:28.520387427 -0700
+@@ -56,6 +56,11 @@
+     local_env["LD_LIBRARY_PATH"] = "../obj%d:obj%d:%s" \
+         % (bits, bits, local_env.get("LD_LIBRARY_PATH", ""))
+     local_env["HUGETLB_DEFAULT_PAGE_SIZE"] = repr(pagesize)
++    if isinstance(cmd, types.StringType):
++        cmd = 'obj%d/%s' % (bits, cmd)
++    else:
++        s = 'obj%d/%s' % (bits, cmd[0])
++        cmd = (s,)+(cmd[1:])
+ 
+     p = subprocess.Popen(cmd, env=local_env, stdout=subprocess.PIPE)
+     try:
+@@ -523,10 +528,11 @@
+     elfshare_test("linkshare")
+     elflink_and_share_test("linkhuge")
+ 
+-    # elflink_rw tests
+-    elflink_rw_test("linkhuge_rw")
+-    # elflink_rw sharing tests
+-    elflink_rw_and_share_test("linkhuge_rw")
++    if 32 in wordsizes:
++        # elflink_rw tests
++        elflink_rw_test("linkhuge_rw")
++        # elflink_rw sharing tests
++        elflink_rw_and_share_test("linkhuge_rw")
+ 
+     # Accounting bug tests
+     # reset free hpages because sharing will have held some
+@@ -555,7 +561,7 @@
+     """
+     Run the set of stress tests.
+     """
+-    iterations = 10	# Number of iterations for looping tests
++    iterations = 10 # Number of iterations for looping tests
+ 
+     # Don't update NRPAGES every time like above because we want to catch the
+     # failures that happen when the kernel doesn't release all of the huge pages
+@@ -570,7 +576,7 @@
+     (rc, tot_pages) = total_hpages()
+     (rc, size) = hpage_size()
+     sysctls = setup_shm_sysctl(tot_pages * size)
+-    threads = 10	# Number of threads for shm-fork
++    threads = 10     # Number of threads for shm-fork
+     # Run shm-fork once using half available hugepages, then once using all
+     # This is to catch off-by-ones or races in the kernel allocated that
+     # can make allocating all hugepages a problem