diff options
| author | William R. Otte <wotte@dre.vanderbilt.edu> | 2010-07-26 17:51:21 +0000 |
|---|---|---|
| committer | William R. Otte <wotte@dre.vanderbilt.edu> | 2010-07-26 17:51:21 +0000 |
| commit | 1c8a91f02cba61e6057c737796aacfa8ac147cc0 (patch) | |
| tree | dee4993ead70b01a7b41c7e49f5cd9030b979e7c | |
| parent | a3481e4a590529b225fc9d7684de1761e871c719 (diff) | |
| download | ATCD-1c8a91f02cba61e6057c737796aacfa8ac147cc0.tar.gz | |
Mon Jul 26 17:50:42 UTC 2010 William R. Otte <wotte@dre.vanderbilt.edu>
* DAnCE/tests/LocalityManager/CPUAffinity/CPUAffinity_exec.cpp:
Use ACE_OS::num_processors to detect if #cpus is greater than 1.
* bin/ciao_tests.lst:
remove MULTICORE from restrictions.
| -rw-r--r-- | CIAO/ChangeLog | 10 | ||||
| -rw-r--r-- | CIAO/DAnCE/tests/LocalityManager/CPUAffinity/CPUAffinity_exec.cpp | 7 | ||||
| -rw-r--r-- | CIAO/bin/ciao_tests.lst | 2 |
3 files changed, 18 insertions, 1 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index 93513602712..8d475983b17 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,13 @@ +Mon Jul 26 17:50:42 UTC 2010 William R. Otte <wotte@dre.vanderbilt.edu> + + * DAnCE/tests/LocalityManager/CPUAffinity/CPUAffinity_exec.cpp: + + Use ACE_OS::num_processors to detect if #cpus is greater than 1. + + * bin/ciao_tests.lst: + + remove MULTICORE from restrictions. + Mon Jul 26 13:40:13 UTC 2010 William R. Otte <wotte@dre.vanderbilt.edu> * tools/XML/XercesString.h: diff --git a/CIAO/DAnCE/tests/LocalityManager/CPUAffinity/CPUAffinity_exec.cpp b/CIAO/DAnCE/tests/LocalityManager/CPUAffinity/CPUAffinity_exec.cpp index af880ab67ff..d708daa347f 100644 --- a/CIAO/DAnCE/tests/LocalityManager/CPUAffinity/CPUAffinity_exec.cpp +++ b/CIAO/DAnCE/tests/LocalityManager/CPUAffinity/CPUAffinity_exec.cpp @@ -63,6 +63,13 @@ namespace CIAO_cpuaffinity_A_Impl { #if defined (LINUX_VERSION_CODE) && defined (KERNEL_VERSION) # if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,8)) + + if (ACE_OS::num_processors () < 2) + { + ACE_DEBUG ((LM_DEBUG, "This machine only has a single processor, aborting\n")); + return; + } + cpu_set_t mask; CPU_ZERO (&mask); diff --git a/CIAO/bin/ciao_tests.lst b/CIAO/bin/ciao_tests.lst index 63422b68bdd..d5bbc48a669 100644 --- a/CIAO/bin/ciao_tests.lst +++ b/CIAO/bin/ciao_tests.lst @@ -49,7 +49,7 @@ TAO/CIAO/DAnCE/tests/LocalityManager/SpawnOne/run_test.pl: !STATIC !MINIMUM !COR TAO/CIAO/DAnCE/tests/LocalityManager/ExplicitExec/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST TAO/CIAO/DAnCE/tests/LocalityManager/SpawnMultiple/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST TAO/CIAO/DAnCE/tests/LocalityManager/ProcessName/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST LINUX -TAO/CIAO/DAnCE/tests/LocalityManager/CPUAffinity/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST LINUX MULTICORE +TAO/CIAO/DAnCE/tests/LocalityManager/CPUAffinity/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST LINUX TAO/CIAO/DAnCE/tests/Bug_3832_Regression/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST TAO/CIAO/connectors/ami4ccm/examples/Hello/descriptors/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST TAO/CIAO/connectors/ami4ccm/tests/Exceptions/descriptors/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST |