Gentoo Archives: gentoo-commits

From: "Robin H. Johnson (robbat2)" <robbat2@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sys-libs/libhugetlbfs/files: libhugetlbfs-2.6-fixup-testsuite.patch
Date: Wed, 04 Nov 2009 04:08:52
Message-Id: E1N5XAv-0005h2-TY@stork.gentoo.org
1 robbat2 09/11/04 04:08:49
2
3 Added: libhugetlbfs-2.6-fixup-testsuite.patch
4 Log:
5 Fully wire up the upstream testsuite.
6 (Portage version: 2.2_rc48/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.1 sys-libs/libhugetlbfs/files/libhugetlbfs-2.6-fixup-testsuite.patch
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/libhugetlbfs/files/libhugetlbfs-2.6-fixup-testsuite.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/libhugetlbfs/files/libhugetlbfs-2.6-fixup-testsuite.patch?rev=1.1&content-type=text/plain
13
14 Index: libhugetlbfs-2.6-fixup-testsuite.patch
15 ===================================================================
16 diff -Nuar --exclude '*.S' --exclude Makefile libhugetlbfs-2.6.orig/tests/run_tests.py libhugetlbfs-2.6/tests/run_tests.py
17 --- libhugetlbfs-2.6.orig/tests/run_tests.py 2009-08-24 05:56:07.000000000 -0700
18 +++ libhugetlbfs-2.6/tests/run_tests.py 2009-10-31 00:40:28.520387427 -0700
19 @@ -56,6 +56,11 @@
20 local_env["LD_LIBRARY_PATH"] = "../obj%d:obj%d:%s" \
21 % (bits, bits, local_env.get("LD_LIBRARY_PATH", ""))
22 local_env["HUGETLB_DEFAULT_PAGE_SIZE"] = repr(pagesize)
23 + if isinstance(cmd, types.StringType):
24 + cmd = 'obj%d/%s' % (bits, cmd)
25 + else:
26 + s = 'obj%d/%s' % (bits, cmd[0])
27 + cmd = (s,)+(cmd[1:])
28
29 p = subprocess.Popen(cmd, env=local_env, stdout=subprocess.PIPE)
30 try:
31 @@ -523,10 +528,11 @@
32 elfshare_test("linkshare")
33 elflink_and_share_test("linkhuge")
34
35 - # elflink_rw tests
36 - elflink_rw_test("linkhuge_rw")
37 - # elflink_rw sharing tests
38 - elflink_rw_and_share_test("linkhuge_rw")
39 + if 32 in wordsizes:
40 + # elflink_rw tests
41 + elflink_rw_test("linkhuge_rw")
42 + # elflink_rw sharing tests
43 + elflink_rw_and_share_test("linkhuge_rw")
44
45 # Accounting bug tests
46 # reset free hpages because sharing will have held some
47 @@ -555,7 +561,7 @@
48 """
49 Run the set of stress tests.
50 """
51 - iterations = 10 # Number of iterations for looping tests
52 + iterations = 10 # Number of iterations for looping tests
53
54 # Don't update NRPAGES every time like above because we want to catch the
55 # failures that happen when the kernel doesn't release all of the huge pages
56 @@ -570,7 +576,7 @@
57 (rc, tot_pages) = total_hpages()
58 (rc, size) = hpage_size()
59 sysctls = setup_shm_sysctl(tot_pages * size)
60 - threads = 10 # Number of threads for shm-fork
61 + threads = 10 # Number of threads for shm-fork
62 # Run shm-fork once using half available hugepages, then once using all
63 # This is to catch off-by-ones or races in the kernel allocated that
64 # can make allocating all hugepages a problem