Currently the hyperthreading tests will only run on 32bit (i386) os versions.
HT is also supported on x86_64, so I changed defines to allow either os version.
Signed-off-by: Murlin Ray Wenzel <[email protected]>
diff -urN
ltp-full-20100831/testcases/kernel/sched/hyperthreading//ht_affinity/ht_affinity.c
ltp-full-20100831.mrw/testcases/kernel/sched/hyperthreading//ht_affinity/ht_affinity.c
---
ltp-full-20100831/testcases/kernel/sched/hyperthreading//ht_affinity/ht_affinity.c
2010-09-14 05:04:34.000000000 -0600
+++
ltp-full-20100831.mrw/testcases/kernel/sched/hyperthreading//ht_affinity/ht_affinity.c
2010-09-17 11:07:50.000000000 -0600
@@ -233,7 +233,7 @@
int main(int argc, char *argv[])
{
-#ifndef __i386__
+#if (!defined __i386__ && !defined __x86_64__)
tst_brkm(TCONF, NULL, "This test suite can only execute on i386
architecture.");
#else
if (!check_ht_capability())
diff -urN
ltp-full-20100831/testcases/kernel/sched/hyperthreading//ht_affinity/ht_utils.c
ltp-full-20100831.mrw/testcases/kernel/sched/hyperthreading//ht_affinity/ht_utils.c
---
ltp-full-20100831/testcases/kernel/sched/hyperthreading//ht_affinity/ht_utils.c
2010-09-14 05:04:34.000000000 -0600
+++
ltp-full-20100831.mrw/testcases/kernel/sched/hyperthreading//ht_affinity/ht_utils.c
2010-09-17 11:08:44.000000000 -0600
@@ -17,7 +17,7 @@
inline void cpuid(int op, int *eax, int *ebx, int *ecx, int *edx)
{
-#ifndef __i386__
+#if (!defined __i386__ && !defined __x86_64__)
return;
#else
__asm__("cpuid"
diff -urN
ltp-full-20100831/testcases/kernel/sched/hyperthreading//ht_enabled/ht_enabled.c
ltp-full-20100831.mrw/testcases/kernel/sched/hyperthreading//ht_enabled/ht_enabled.c
---
ltp-full-20100831/testcases/kernel/sched/hyperthreading//ht_enabled/ht_enabled.c
2010-09-14 05:04:34.000000000 -0600
+++
ltp-full-20100831.mrw/testcases/kernel/sched/hyperthreading//ht_enabled/ht_enabled.c
2010-09-17 10:59:00.000000000 -0600
@@ -22,7 +22,7 @@
int main(int argc, char *argv[])
{
int ret_val = 1;
-#ifndef __i386__
+#if (!defined __x86_64__ && !defined __i386__)
tst_brkm(TCONF, NULL, "This test suite can only execute on i386
architecture.");
#else
ret_val = check_ht_capability();
diff -urN
ltp-full-20100831/testcases/kernel/sched/hyperthreading//ht_enabled/ht_utils.c
ltp-full-20100831.mrw/testcases/kernel/sched/hyperthreading//ht_enabled/ht_utils.c
---
ltp-full-20100831/testcases/kernel/sched/hyperthreading//ht_enabled/ht_utils.c
2010-09-14 05:04:34.000000000 -0600
+++
ltp-full-20100831.mrw/testcases/kernel/sched/hyperthreading//ht_enabled/ht_utils.c
2010-09-17 11:06:02.000000000 -0600
@@ -20,7 +20,7 @@
inline void cpuid(int op, int *eax, int *ebx, int *ecx, int *edx)
{
-#ifndef __i386__
+#if (!defined __i386__ && !defined __x86_64__)
return;
#else
__asm__("cpuid"
@@ -47,8 +47,7 @@
/*printf("The processor in this system supports HT\n");*/
return 1;
} else {
- /*printf("The processor in this system does not support
- * HT\n");*/
+ /*printf("The processor in this system does not support
HT\n");*/
return 0;
}
}
diff -urN
ltp-full-20100831/testcases/kernel/sched/hyperthreading//ht_interrupt/ht_interrupt.c
ltp-full-20100831.mrw/testcases/kernel/sched/hyperthreading//ht_interrupt/ht_interrupt.c
---
ltp-full-20100831/testcases/kernel/sched/hyperthreading//ht_interrupt/ht_interrupt.c
2010-09-14 05:04:34.000000000 -0600
+++
ltp-full-20100831.mrw/testcases/kernel/sched/hyperthreading//ht_interrupt/ht_interrupt.c
2010-09-17 11:10:08.000000000 -0600
@@ -111,7 +111,7 @@
{
tst_resm(TINFO, "Begin: HyperThreading Interrupt");
-#ifndef __i386__
+#if (!defined __i386__ && !defined __x86_64__)
tst_brkm(TCONF, NULL, "This test suite can only execute on i386
architecture.");
#else
if (!check_ht_capability())
diff -urN
ltp-full-20100831/testcases/kernel/sched/hyperthreading//ht_interrupt/ht_utils.c
ltp-full-20100831.mrw/testcases/kernel/sched/hyperthreading//ht_interrupt/ht_utils.c
---
ltp-full-20100831/testcases/kernel/sched/hyperthreading//ht_interrupt/ht_utils.c
2010-09-14 05:04:34.000000000 -0600
+++
ltp-full-20100831.mrw/testcases/kernel/sched/hyperthreading//ht_interrupt/ht_utils.c
2010-09-17 11:10:58.000000000 -0600
@@ -60,7 +60,7 @@
inline void cpuid(int op, int *eax, int *ebx, int *ecx, int *edx)
{
-#ifndef __i386__
+#if (!defined __i386__ && !defined __x86_64__)
return;
#else
__asm__("cpuid"
------------------------------------------------------------------------------
Start uncovering the many advantages of virtual appliances
and start using them to simplify application deployment and
accelerate your shift to cloud computing.
http://p.sf.net/sfu/novell-sfdev2dev
_______________________________________________
Ltp-list mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ltp-list
