* forgot to fix up includes in the test directory with yesterday's commit.

This commit was SVN r8996.

test/class/ompi_bitmap.c

@@ -8,7 +8,7 @@
 #include "support.h"
 
 #include "ompi/class/ompi_bitmap.h"
-#include "ompi/include/constants.h"
+#include "ompi/constants.h"
 
 #define BSIZE 26
 #define SIZE_OF_CHAR (sizeof(char) * 8)

test/class/orte_bitmap.c

@@ -3,7 +3,7 @@
  */
 
 #include "orte_config.h"
-#include "include/orte_constants.h"
+#include "orte/orte_constants.h"
 
 #include <stdio.h>
 #include "support.h"

test/dss/dss_buffer.c

@@ -17,8 +17,8 @@
  */
 
 #include "orte_config.h"
-#include "orte/include/orte_constants.h"
-#include "orte/include/orte_types.h"
+#include "orte/orte_constants.h"
+#include "orte/orte_types.h"
 
 
 #include <stdio.h>

test/dss/dss_cmp.c

@@ -17,8 +17,8 @@
  */
 
 #include "orte_config.h"
-#include "orte/include/orte_constants.h"
-#include "orte/include/orte_types.h"
+#include "orte/orte_constants.h"
+#include "orte/orte_types.h"
 
 
 #include <stdio.h>

test/dss/dss_copy.c

@@ -17,8 +17,8 @@
  */
 
 #include "orte_config.h"
-#include "orte/include/orte_constants.h"
-#include "orte/include/orte_types.h"
+#include "orte/orte_constants.h"
+#include "orte/orte_types.h"
 
 
 #include <stdio.h>

test/dss/dss_inc_dec.c

@@ -17,8 +17,8 @@
  */
 
 #include "orte_config.h"
-#include "orte/include/orte_constants.h"
-#include "orte/include/orte_types.h"
+#include "orte/orte_constants.h"
+#include "orte/orte_types.h"
 
 
 #include <stdio.h>

test/dss/dss_print.c

@@ -17,8 +17,8 @@
  */
 
 #include "orte_config.h"
-#include "orte/include/orte_constants.h"
-#include "orte/include/orte_types.h"
+#include "orte/orte_constants.h"
+#include "orte/orte_types.h"
 
 
 #include <stdio.h>

test/dss/dss_release.c

@@ -17,8 +17,8 @@
  */
 
 #include "orte_config.h"
-#include "orte/include/orte_constants.h"
-#include "orte/include/orte_types.h"
+#include "orte/orte_constants.h"
+#include "orte/orte_types.h"
 
 
 #include <stdio.h>

test/dss/dss_set_get.c

@@ -17,8 +17,8 @@
  */
 
 #include "orte_config.h"
-#include "orte/include/orte_constants.h"
-#include "orte/include/orte_types.h"
+#include "orte/orte_constants.h"
+#include "orte/orte_types.h"
 
 
 #include <stdio.h>

test/dss/dss_size.c

@@ -17,8 +17,8 @@
  */
 
 #include "orte_config.h"
-#include "orte/include/orte_constants.h"
-#include "orte/include/orte_types.h"
+#include "orte/orte_constants.h"
+#include "orte/orte_types.h"
 
 
 #include <stdio.h>

test/mca/gpr/gpr_dt_buffer.c

@@ -27,7 +27,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "orte/include/orte_constants.h"
+#include "orte/orte_constants.h"
 
 #include "opal/runtime/opal.h"
 #include "opal/util/malloc.h"

test/mca/gpr/gpr_dt_cmp.c

@@ -27,7 +27,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "orte/include/orte_constants.h"
+#include "orte/orte_constants.h"
 
 #include "opal/runtime/opal.h"
 #include "opal/util/malloc.h"

test/mca/gpr/gpr_dt_copy.c

@@ -27,7 +27,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "orte/include/orte_constants.h"
+#include "orte/orte_constants.h"
 
 #include "opal/runtime/opal.h"
 #include "opal/util/malloc.h"

test/mca/gpr/gpr_dt_print.c

@@ -27,7 +27,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "orte/include/orte_constants.h"
+#include "orte/orte_constants.h"
 
 #include "opal/runtime/opal.h"
 #include "opal/util/malloc.h"

test/mca/gpr/gpr_dt_release.c

@@ -27,7 +27,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "orte/include/orte_constants.h"
+#include "orte/orte_constants.h"
 
 #include "opal/runtime/opal.h"
 #include "opal/util/malloc.h"

test/mca/gpr/gpr_dt_size.c

@@ -27,7 +27,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "orte/include/orte_constants.h"
+#include "orte/orte_constants.h"
 
 #include "opal/runtime/opal.h"
 #include "opal/util/malloc.h"

test/mca/gpr/gpr_internal_fns.c

@@ -30,7 +30,7 @@
 #include <string.h>
 
 #include "opal/runtime/opal.h"
-#include "orte/include/orte_constants.h"
+#include "orte/orte_constants.h"
 
 #include "opal/util/malloc.h"
 #include "opal/util/output.h"

test/mca/gpr/gpr_mem_leaks.c

@@ -29,7 +29,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "include/orte_constants.h"
+#include "orte/orte_constants.h"
 #include "orte/mca/schema/schema.h"
 #include "orte/mca/schema/base/base.h"
 #include "orte/mca/ns/base/base.h"

test/mca/gpr/gpr_overwrite.c

@@ -17,8 +17,8 @@
  */
 
 #include "orte_config.h"
-#include "include/orte_constants.h"
-#include "include/orte_types.h"
+#include "orte/orte_constants.h"
+#include "orte/orte_types.h"
 #include "orte/mca/schema/schema.h"
 #include "orte/mca/schema/base/base.h"
 #include "orte/mca/ns/base/base.h"

test/mca/gpr/gpr_put_get.c

@@ -36,7 +36,7 @@
 #include "opal/util/malloc.h"
 #include "opal/util/output.h"
 
-#include "orte/include/orte_constants.h"
+#include "orte/orte_constants.h"
 #include "orte/mca/schema/schema.h"
 #include "orte/mca/schema/base/base.h"
 #include "orte/mca/ns/base/base.h"

test/mca/gpr/gpr_quick_put.c

@@ -36,7 +36,7 @@
 #include "opal/util/malloc.h"
 #include "opal/util/output.h"
 
-#include "orte/include/orte_constants.h"
+#include "orte/orte_constants.h"
 #include "orte/mca/schema/schema.h"
 #include "orte/mca/schema/base/base.h"
 #include "orte/mca/ns/base/base.h"

test/mca/gpr/gpr_quick_triggers.c

@@ -36,7 +36,7 @@
 #include "opal/util/malloc.h"
 #include "opal/util/output.h"
 
-#include "orte/include/orte_constants.h"
+#include "orte/orte_constants.h"
 #include "orte/mca/schema/schema.h"
 #include "orte/mca/schema/base/base.h"
 #include "orte/mca/ns/base/base.h"

test/mca/gpr/gpr_sub_test.c

@@ -36,7 +36,7 @@
 #include "opal/util/malloc.h"
 #include "opal/util/output.h"
 
-#include "orte/include/orte_constants.h"
+#include "orte/orte_constants.h"
 #include "orte/mca/schema/schema.h"
 #include "orte/mca/schema/base/base.h"
 #include "orte/mca/ns/base/base.h"

test/mca/gpr/gpr_threads.c

@@ -17,8 +17,8 @@
  */
 
 #include "orte_config.h"
-#include "include/orte_constants.h"
-#include "include/orte_types.h"
+#include "orte/orte_constants.h"
+#include "orte/orte_types.h"
 #include "orte/mca/schema/schema.h"
 
 #include <stdio.h>

test/mca/gpr/gpr_triggers.c

@@ -36,7 +36,7 @@
 #include "opal/util/malloc.h"
 #include "opal/util/output.h"
 
-#include "orte/include/orte_constants.h"
+#include "orte/orte_constants.h"
 #include "orte/mca/ns/base/base.h"
 #include "orte/mca/errmgr/errmgr.h"
 

test/mca/ns/ns_dt_buffer.c

@@ -27,7 +27,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "orte/include/orte_constants.h"
+#include "orte/orte_constants.h"
 
 #include "opal/mca/base/base.h"
 #include "opal/runtime/opal.h"

test/mca/ns/ns_dt_compare.c

@@ -27,7 +27,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "orte/include/orte_constants.h"
+#include "orte/orte_constants.h"
 
 #include "opal/mca/base/base.h"
 #include "opal/runtime/opal.h"

test/mca/ns/ns_dt_copy.c

@@ -27,7 +27,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "orte/include/orte_constants.h"
+#include "orte/orte_constants.h"
 
 #include "opal/mca/base/base.h"
 #include "opal/runtime/opal.h"

test/mca/ns/ns_dt_print.c

@@ -27,7 +27,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "orte/include/orte_constants.h"
+#include "orte/orte_constants.h"
 
 #include "opal/mca/base/base.h"
 #include "opal/runtime/opal.h"

test/mca/ns/ns_dt_release.c

@@ -27,7 +27,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "orte/include/orte_constants.h"
+#include "orte/orte_constants.h"
 
 #include "opal/mca/base/base.h"
 #include "opal/runtime/opal.h"

test/mca/ns/ns_dt_size.c

@@ -27,7 +27,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "orte/include/orte_constants.h"
+#include "orte/orte_constants.h"
 
 #include "opal/mca/base/base.h"
 #include "opal/runtime/opal.h"

test/mca/ns/ns_nds.c

@@ -32,8 +32,8 @@
 #include "components.h"
 
 #include "include/constants.h"
-#include "include/orte_constants.h"
-#include "include/orte_types.h"
+#include "orte/orte_constants.h"
+#include "orte/orte_types.h"
 
 #include "runtime/runtime.h"
 #include "util/proc_info.h"

test/mca/ns/ns_replica.c

@@ -23,7 +23,7 @@
 #include "support.h"
 #include "components.h"
 
-#include "include/orte_constants.h"
+#include "orte/orte_constants.h"
 #include "orte/mca/schema/schema.h"
 #include "util/proc_info.h"
 #include "opal/util/malloc.h"

test/mca/ras/test_ras.c

@@ -23,7 +23,7 @@
 #include "support.h"
 #include "components.h"
 
-#include "include/orte_constants.h"
+#include "orte/orte_constants.h"
 
 #include "dps/dps.h"
 #include "runtime/runtime.h"

test/mca/rds/test_rds.c

@@ -23,7 +23,7 @@
 #include "support.h"
 #include "components.h"
 
-#include "include/orte_constants.h"
+#include "orte/orte_constants.h"
 
 #include "dps/dps.h"
 #include "runtime/runtime.h"

test/mca/rds/test_rds2.c

@@ -23,7 +23,7 @@
 #include "support.h"
 #include "components.h"
 
-#include "include/orte_constants.h"
+#include "orte/orte_constants.h"
 
 #include "runtime/runtime.h"
 #include "orte/mca/gpr/gpr.h"

test/mca/rmaps/test_rmaps.c

@@ -23,7 +23,7 @@
 #include "support.h"
 #include "components.h"
 
-#include "include/orte_constants.h"
+#include "orte/orte_constants.h"
 
 #include "dps/dps.h"
 #include "runtime/runtime.h"

test/mca/rmgr/rmgr_dt_buffer.c

@@ -27,7 +27,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "orte/include/orte_constants.h"
+#include "orte/orte_constants.h"
 
 #include "opal/mca/base/base.h"
 #include "opal/runtime/opal.h"

test/mca/rmgr/rmgr_dt_compare.c

@@ -27,7 +27,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "orte/include/orte_constants.h"
+#include "orte/orte_constants.h"
 
 #include "opal/mca/base/base.h"
 #include "opal/runtime/opal.h"

test/mca/rmgr/rmgr_dt_copy.c

@@ -27,7 +27,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "orte/include/orte_constants.h"
+#include "orte/orte_constants.h"
 
 #include "opal/mca/base/base.h"
 #include "opal/runtime/opal.h"

test/mca/rmgr/rmgr_dt_print.c

@@ -27,7 +27,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "orte/include/orte_constants.h"
+#include "orte/orte_constants.h"
 
 #include "opal/mca/base/base.h"
 #include "opal/runtime/opal.h"

test/mca/rmgr/rmgr_dt_release.c

@@ -27,7 +27,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "orte/include/orte_constants.h"
+#include "orte/orte_constants.h"
 
 #include "opal/mca/base/base.h"
 #include "opal/runtime/opal.h"

test/mca/rmgr/rmgr_dt_size.c

@@ -27,7 +27,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "orte/include/orte_constants.h"
+#include "orte/orte_constants.h"
 
 #include "opal/mca/base/base.h"
 #include "opal/runtime/opal.h"

test/mca/schema/test_schema.c

@@ -23,7 +23,7 @@
 #include "support.h"
 #include "components.h"
 
-#include "include/orte_constants.h"
+#include "orte/orte_constants.h"
 
 /* output files needed by the test */
 static FILE *test_out=NULL;

test/mca/soh/soh_dt_buffer.c

@@ -27,7 +27,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "orte/include/orte_constants.h"
+#include "orte/orte_constants.h"
 
 #include "opal/mca/base/base.h"
 #include "opal/runtime/opal.h"

test/mca/soh/soh_dt_compare.c

@@ -27,7 +27,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "orte/include/orte_constants.h"
+#include "orte/orte_constants.h"
 
 #include "opal/mca/base/base.h"
 #include "opal/runtime/opal.h"

test/mca/soh/soh_dt_copy.c

@@ -27,7 +27,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "orte/include/orte_constants.h"
+#include "orte/orte_constants.h"
 
 #include "opal/mca/base/base.h"
 #include "opal/runtime/opal.h"

test/mca/soh/soh_dt_print.c

@@ -27,7 +27,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "orte/include/orte_constants.h"
+#include "orte/orte_constants.h"
 
 #include "opal/mca/base/base.h"
 #include "opal/runtime/opal.h"

test/mca/soh/soh_dt_release.c

@@ -27,7 +27,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "orte/include/orte_constants.h"
+#include "orte/orte_constants.h"
 
 #include "opal/mca/base/base.h"
 #include "opal/runtime/opal.h"

test/mca/soh/soh_dt_size.c

@@ -27,7 +27,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "orte/include/orte_constants.h"
+#include "orte/orte_constants.h"
 
 #include "opal/mca/base/base.h"
 #include "opal/runtime/opal.h"

test/memory/opal_memory_basic.c

@@ -23,7 +23,7 @@
 #include <sys/mman.h>
 #include <assert.h>
 
-#include "ompi/include/constants.h"
+#include "ompi/constants.h"
 #include "opal/runtime/opal.h"
 #include "opal/memoryhooks/memory.h"
 

test/memory/opal_memory_cxx.cc

@@ -21,7 +21,7 @@
 #include <vector>
 #include <stdio.h>
 
-#include "ompi/include/constants.h"
+#include "ompi/constants.h"
 #include "opal/runtime/opal.h"
 #include "opal/memoryhooks/memory.h"
 

test/memory/opal_memory_speed.c

@@ -22,7 +22,7 @@
 #include <stdio.h>
 #include <sys/time.h>
 
-#include "ompi/include/constants.h"
+#include "ompi/constants.h"
 #include "opal/runtime/opal.h"
 #include "opal/memoryhooks/memory.h"
 

test/runtime/opal_init_finalize.c

@@ -19,7 +19,7 @@
 #include "ompi_config.h"
 
 #include "opal/runtime/opal.h"
-#include "opal/include/constants.h"
+#include "opal/constants.h"
 
 int
 main(int argc, char *argv[])

test/runtime/orte_init_finalize.c

@@ -17,7 +17,7 @@
  */
 
 #include "orte_config.h"
-#include "orte/include/orte_constants.h"
+#include "orte/orte_constants.h"
 
 
 #include <stdio.h>

test/runtime/start_shut.c

@@ -17,7 +17,7 @@
  */
 
 #include "orte_config.h"
-#include "orte/include/orte_constants.h"
+#include "orte/orte_constants.h"
 
 
 #include <stdio.h>

test/support/components.c

@@ -20,8 +20,8 @@
 
 #include <string.h>
 
-#include "ompi/include/constants.h"
-#include "opal/include/constants.h"
+#include "ompi/constants.h"
+#include "opal/constants.h"
 #include "opal/mca/mca.h"
 #include "opal/libltdl/ltdl.h"
 

test/threads/opal_condition.c

@@ -4,10 +4,10 @@
 #include <time.h>
 
 #include "support.h"
-#include "opal/include/constants.h"
+#include "opal/constants.h"
 #include "opal/threads/threads.h"
 #include "opal/threads/condition.h"
-#include "opal/include/sys/atomic.h"
+#include "opal/sys/atomic.h"
 
 
 #if !OMPI_HAVE_THREAD_SUPPORT

test/threads/opal_thread.c

@@ -3,9 +3,9 @@
 #include <stdio.h>
 
 #include "support.h"
-#include "opal/include/constants.h"
+#include "opal/constants.h"
 #include "opal/threads/threads.h"
-#include "opal/include/sys/atomic.h"
+#include "opal/sys/atomic.h"
 
 
 #if !OMPI_HAVE_THREAD_SUPPORT

test/util/opal_argv.c

@@ -22,7 +22,7 @@
 #include <stdlib.h>
 
 #include "support.h"
-#include "opal/include/constants.h"
+#include "opal/constants.h"
 #include "opal/util/argv.h"
 
 static bool test1(void);

test/util/opal_basename.c

@@ -23,7 +23,7 @@
 #include <stdlib.h>
 
 #include "support.h"
-#include "include/constants.h"
+#include "opal/constants.h"
 #include "opal/util/basename.h"
 
 

test/util/opal_error.c

@@ -36,10 +36,10 @@
 #include <errno.h>
 
 #include "opal/util/error.h"
-#include "opal/include/constants.h"
+#include "opal/constants.h"
 #include "opal/runtime/opal.h"
 #include "orte/runtime/runtime.h"
-#include "orte/include/orte_constants.h"
+#include "orte/orte_constants.h"
 
 int
 main(int argc, char *argv[])

test/util/opal_if.c

@@ -37,7 +37,7 @@
 #include "support.h"
 #include "opal/runtime/opal.h"
 #include "opal/util/if.h"
-#include "opal/include/constants.h"
+#include "opal/constants.h"
 
 
 static bool

test/util/opal_os_create_dirpath.c

@@ -31,7 +31,7 @@
 
 #include "support.h"
 #include "opal/runtime/opal.h"
-#include "opal/include/constants.h"
+#include "opal/constants.h"
 #include "opal/util/os_path.h"
 #include "opal/util/os_create_dirpath.h"
 

test/util/opal_timer.c

@@ -21,7 +21,7 @@
 #include <unistd.h>
 
 #include "opal/runtime/opal.h"
-#include "opal/include/constants.h"
+#include "opal/constants.h"
 #include "opal/mca/timer/base/base.h"
 
 int

test/util/orte_session_dir.c

@@ -33,7 +33,7 @@
 #include <sys/stat.h>
 
 #include "support.h"
-#include "orte/include/orte_constants.h"
+#include "orte/orte_constants.h"
 #include "orte/mca/ns/ns_types.h"
 #include "orte/util/proc_info.h"
 #include "orte/util/sys_info.h"

test/util/orte_sys_info.c

@@ -24,7 +24,7 @@
 #include <sys/param.h>
 #endif
 
-#include "util/sys_info.h"
+#include "orte/util/sys_info.h"
 #include "support.h"
 
 static bool test1(void);   /* verify it returns info */

test/util/orte_universe_setup_file_io.c

@@ -17,7 +17,7 @@
  */
 
 #include "orte_config.h"
-#include "include/orte_constants.h"
+#include "orte/orte_constants.h"
 
 #include <stdio.h>
 #include <string.h>
@@ -26,8 +26,8 @@
 #include <sys/param.h>
 #endif
 
-#include "util/univ_info.h"
-#include "util/universe_setup_file_io.h"
+#include "orte/util/univ_info.h"
+#include "orte/util/universe_setup_file_io.h"
 #include "support.h"
 
 static bool test1(void);   /* verify it returns info */