Fix up tests so that they all compile and (mostly) run

This commit was SVN r6338.

test/asm/Makefile.am

@@ -36,46 +36,46 @@ EXTRA_DIST = run_tests
 ######################################################################
 
 atomic_barrier_SOURCES = atomic_barrier.c
-atomic_barrier_LDADD = $(top_builddir)/src/asm/libasm.la
+atomic_barrier_LDADD = $(top_builddir)/opal/asm/libasm.la
 
 atomic_barrier_noinline.c:
 	ln -s $(top_srcdir)/test/asm/atomic_barrier.c atomic_barrier_noinline.c
 atomic_barrier_noinline_SOURCES = atomic_barrier_noinline.c
-atomic_barrier_noinline_LDADD = $(top_builddir)/src/asm/libasm.la
+atomic_barrier_noinline_LDADD = $(top_builddir)/opal/asm/libasm.la
 atomic_barrier_noinline_CFLAGS = $(AM_CFLAGS) -DOMPI_DISABLE_INLINE_ASM
 
 ######################################################################
 
 atomic_spinlock_SOURCES = atomic_spinlock.c
-atomic_spinlock_LDADD = $(top_builddir)/src/asm/libasm.la $(libs)
+atomic_spinlock_LDADD = $(top_builddir)/opal/asm/libasm.la $(libs)
 
 atomic_spinlock_noinline.c:
 	ln -s $(top_srcdir)/test/asm/atomic_spinlock.c atomic_spinlock_noinline.c
 atomic_spinlock_noinline_SOURCES = atomic_spinlock_noinline.c
 atomic_spinlock_noinline_CFLAGS = $(AM_CFLAGS) -DOMPI_DISABLE_INLINE_ASM
-atomic_spinlock_noinline_LDADD = $(top_builddir)/src/asm/libasm.la $(libs)
+atomic_spinlock_noinline_LDADD = $(top_builddir)/opal/asm/libasm.la $(libs)
 
 ######################################################################
 
 atomic_math_SOURCES = atomic_math.c
-atomic_math_LDADD = $(top_builddir)/src/asm/libasm.la $(libs)
+atomic_math_LDADD = $(top_builddir)/opal/asm/libasm.la $(libs)
 
 atomic_math_noinline.c:
 	ln -s $(top_srcdir)/test/asm/atomic_math.c atomic_math_noinline.c
 atomic_math_noinline_SOURCES = atomic_math_noinline.c
 atomic_math_noinline_CFLAGS = $(AM_CFLAGS) -DOMPI_DISABLE_INLINE_ASM
-atomic_math_noinline_LDADD = $(top_builddir)/src/asm/libasm.la $(libs)
+atomic_math_noinline_LDADD = $(top_builddir)/opal/asm/libasm.la $(libs)
 
 ######################################################################
 
 atomic_cmpset_SOURCES = atomic_cmpset.c
-atomic_cmpset_LDADD = $(top_builddir)/src/asm/libasm.la $(libs)
+atomic_cmpset_LDADD = $(top_builddir)/opal/asm/libasm.la $(libs)
 
 atomic_cmpset_noinline.c:
 	ln -s $(top_srcdir)/test/asm/atomic_cmpset.c atomic_cmpset_noinline.c
 atomic_cmpset_noinline_SOURCES = atomic_cmpset_noinline.c
 atomic_cmpset_noinline_CFLAGS = $(AM_CFLAGS) -DOMPI_DISABLE_INLINE_ASM
-atomic_cmpset_noinline_LDADD = $(top_builddir)/src/asm/libasm.la $(libs)
+atomic_cmpset_noinline_LDADD = $(top_builddir)/opal/asm/libasm.la $(libs)
 
 ######################################################################
 

test/class/Makefile.am

@@ -34,55 +34,66 @@ TESTS = \
 
 ompi_bitmap_SOURCES = ompi_bitmap.c 
 ompi_bitmap_LDADD = \
-        $(top_builddir)/src/libmpi.la \
+        $(top_builddir)/ompi/libmpi.la \
+        $(top_builddir)/orte/liborte.la \
+        $(top_builddir)/opal/libopal.la \
         $(top_builddir)/test/support/libsupport.a
 ompi_bitmap_DEPENDENCIES = $(ompi_bitmap_LDADD)
 
 ompi_circular_buffer_fifo_SOURCES = ompi_circular_buffer_fifo.c 
 ompi_circular_buffer_fifo_LDADD = \
-        $(top_builddir)/src/libmpi.la \
+        $(top_builddir)/ompi/libmpi.la \
+        $(top_builddir)/orte/liborte.la \
+        $(top_builddir)/opal/libopal.la \
         $(top_builddir)/test/support/libsupport.a
 ompi_circular_buffer_fifo_DEPENDENCIES = $(ompi_circular_buffer_fifo_LDADD)
 
 ompi_fifo_SOURCES = ompi_fifo.c 
 ompi_fifo_LDADD = \
-        $(top_builddir)/src/libmpi.la \
+        $(top_builddir)/ompi/libmpi.la \
+        $(top_builddir)/orte/liborte.la \
+        $(top_builddir)/opal/libopal.la \
         $(top_builddir)/test/support/libsupport.a
 ompi_fifo_DEPENDENCIES = $(ompi_fifo_LDADD)
 
 opal_list_SOURCES = opal_list.c 
 opal_list_LDADD = \
-        $(top_builddir)/src/libmpi.la \
+        $(top_builddir)/opal/libopal.la \
         $(top_builddir)/test/support/libsupport.a
 opal_list_DEPENDENCIES = $(opal_list_LDADD)
 
 opal_hash_table_SOURCES = opal_hash_table.c
 opal_hash_table_LDADD = \
-        $(top_builddir)/src/libmpi.la \
+        $(top_builddir)/opal/libopal.la \
         $(top_builddir)/test/support/libsupport.a
 opal_hash_table_DEPENDENCIES = $(opal_hash_table_LDADD)
 
 ompi_pointer_array_SOURCES = ompi_pointer_array.c
 ompi_pointer_array_LDADD = \
-        $(top_builddir)/src/libmpi.la \
+        $(top_builddir)/ompi/libmpi.la \
+        $(top_builddir)/orte/liborte.la \
+        $(top_builddir)/opal/libopal.la \
         $(top_builddir)/test/support/libsupport.a
 ompi_pointer_array_DEPENDENCIES = $(ompi_pointer_array_LDADD)
 
 opal_value_array_SOURCES = opal_value_array.c
 opal_value_array_LDADD = \
-        $(top_builddir)/src/libmpi.la \
+        $(top_builddir)/opal/libopal.la \
         $(top_builddir)/test/support/libsupport.a
 opal_value_array_DEPENDENCIES = $(opal_value_array_LDADD)
 
 ompi_rb_tree_SOURCES = ompi_rb_tree.c
 ompi_rb_tree_LDADD = \
-        $(top_builddir)/src/libmpi.la \
+        $(top_builddir)/ompi/libmpi.la \
+        $(top_builddir)/orte/liborte.la \
+        $(top_builddir)/opal/libopal.la \
 	$(top_builddir)/test/support/libsupport.a
 ompi_rb_tree_DEPENDENCIES = $(ompi_rb_tree_LDADD)
 
 orte_bitmap_SOURCES = orte_bitmap.c 
 orte_bitmap_LDADD = \
-        $(top_builddir)/src/libmpi.la \
+        $(top_builddir)/orte/liborte.la \
+        $(top_builddir)/opal/libopal.la \
         $(top_builddir)/test/support/libsupport.a
 orte_bitmap_DEPENDENCIES = $(orte_bitmap_LDADD)
 

test/dps/Makefile.am

@@ -25,6 +25,7 @@ TESTS = \
 
 dps_test_SOURCES = dps_test.c
 dps_test_LDADD = \
-        $(top_builddir)/src/libmpi.la \
+        $(top_builddir)/orte/liborte.la \
+        $(top_builddir)/opal/libopal.la \
         $(top_builddir)/test/support/libsupport.a 
 dps_test_DEPENDENCIES = $(dps_test_LDADD)

test/dps/dps_test.c

@@ -15,10 +15,10 @@
  */
 
 #include "orte_config.h"
-#include "../src/include/orte_constants.h"
-#include "../src/include/orte_types.h"
-#include "../../src/dps/dps.h"
-#include "../../src/dps/dps_types.h"
+#include "orte/include/orte_constants.h"
+#include "orte/include/orte_types.h"
+#include "orte/dps/dps.h"
+#include "orte/dps/dps_types.h"
 
 
 #include <stdio.h>
@@ -34,18 +34,18 @@
 #include "include/constants.h"
 
 #include "support.h"
-#include "../src/runtime/runtime.h"
-#include "../src/util/proc_info.h"
-#include "../src/util/sys_info.h"
+#include "orte/runtime/runtime.h"
+#include "orte/util/proc_info.h"
+#include "opal/util/sys_info.h"
 #include "opal/util/malloc.h"
 #include "opal/util/output.h"
-#include "../src/mca/base/base.h"
-#include "../src/dps/dps.h"
-#include "../src/mca/ns/ns.h"
-#include "../src/mca/ns/base/base.h"
-#include "../src/mca/gpr/base/base.h"
-#include "../src/mca/rmgr/base/base.h"
-#include "../src/mca/soh/base/base.h"
+#include "opal/mca/base/base.h"
+#include "orte/dps/dps.h"
+#include "orte/mca/ns/ns.h"
+#include "orte/mca/ns/base/base.h"
+#include "orte/mca/gpr/base/base.h"
+#include "orte/mca/rmgr/base/base.h"
+#include "orte/mca/soh/base/base.h"
 
 #define NUM_ITERS 3
 #define NUM_ELEMS 10
@@ -89,7 +89,7 @@ int main (int argc, char* argv[])
     opal_set_using_threads(OMPI_HAVE_THREAD_SUPPORT);
 
     /* For malloc debugging */
-    ompi_malloc_init();
+    opal_malloc_init();
 
     /* Ensure the system_info structure is instantiated and initialized */
     if (ORTE_SUCCESS != (ret = orte_sys_info())) {

test/mca/ns/Makefile.am

@@ -29,17 +29,20 @@ TESTS = \
 ns_replica_SOURCES = ns_replica.c
 ns_replica_LDADD = \
         $(top_builddir)/test/support/libsupport.a \
-        $(top_builddir)/src/libmpi.la 
+        $(top_builddir)/orte/liborte.la \
+        $(top_builddir)/opal/libopal.la
 ns_replica_DEPENDENCIES = $(ns_replica_LDADD)
 
 ns_proxy_SOURCES = ns_proxy.c
 ns_proxy_LDADD = \
         $(top_builddir)/test/support/libsupport.a \
-        $(top_builddir)/src/libmpi.la 
+        $(top_builddir)/orte/liborte.la \
+        $(top_builddir)/opal/libopal.la
 ns_proxy_DEPENDENCIES = $(ns_proxy_LDADD)
 
 ns_nds_SOURCES = ns_nds.c
 ns_nds_LDADD = \
         $(top_builddir)/test/support/libsupport.a \
-        $(top_builddir)/src/libmpi.la 
+        $(top_builddir)/orte/liborte.la \
+        $(top_builddir)/opal/libopal.la
 ns_nds_DEPENDENCIES = $(ns_nds_LDADD)

test/mca/ns/ns_nds.c

@@ -69,7 +69,7 @@ int main (int argc, char* argv[])
     opal_set_using_threads(OMPI_HAVE_THREAD_SUPPORT);
 
     /* For malloc debugging */
-    ompi_malloc_init();
+    opal_malloc_init();
 
     /* set seed to true to force replica selection */
     orte_process_info.seed = true;
@@ -122,7 +122,7 @@ int main (int argc, char* argv[])
 
     orte_proc_info_finalize();
     mca_base_close();
-    ompi_malloc_finalize();
+    opal_malloc_finalize();
     opal_output_finalize();
 
     fclose( test_out );

test/mca/ns/ns_replica.c

@@ -69,7 +69,7 @@ int main(int argc, char **argv)
     opal_set_using_threads(OMPI_HAVE_THREAD_SUPPORT);
 
     /* For malloc debugging */
-    ompi_malloc_init();
+    opal_malloc_init();
 
     /* set seed to true to force replica selection */
     orte_process_info.seed = true;
@@ -266,7 +266,7 @@ int main(int argc, char **argv)
 
     orte_proc_info_finalize();
     mca_base_close();
-    ompi_malloc_finalize();
+    opal_malloc_finalize();
     opal_output_finalize();
 
     fclose( test_out );

test/mca/oob/Makefile.am

@@ -29,18 +29,21 @@ TESTS = \
 oob_test_SOURCES = oob_test.c
 oob_test_LDADD = \
         $(top_builddir)/test/support/libsupport.a \
-        $(top_builddir)/src/libmpi.la
+        $(top_builddir)/orte/liborte.la \
+        $(top_builddir)/opal/libopal.la
 oob_test_DEPENDENCIES = $(oob_test_LDADD)
 
 oob_test_self_SOURCES = oob_test_self.c
 oob_test_self_LDADD = \
         $(top_builddir)/test/support/libsupport.a \
-        $(top_builddir)/src/libmpi.la
+        $(top_builddir)/orte/liborte.la \
+        $(top_builddir)/opal/libopal.la
 oob_test_self_DEPENDENCIES = $(oob_test_LDADD)
 
 oob_test_packed_SOURCES = oob_test_packed.c
 oob_test_packed_LDADD = \
         $(top_builddir)/test/support/libsupport.a \
-        $(top_builddir)/src/libmpi.la
+        $(top_builddir)/orte/liborte.la \
+        $(top_builddir)/opal/libopal.la
 oob_test_packed_DEPENDENCIES = $(oob_test_LDADD)
 

test/mca/ras/Makefile.am

@@ -27,5 +27,6 @@ TESTS = \
 test_ras_SOURCES = test_ras.c
 test_ras_LDADD = \
         $(top_builddir)/test/support/libsupport.a \
-        $(top_builddir)/src/libmpi.la 
+        $(top_builddir)/orte/liborte.la  \
+        $(top_builddir)/opal/libopal.la 
 test_ras_DEPENDENCIES = $(test_ras_LDADD)

test/mca/ras/test_ras.c

@@ -80,7 +80,7 @@ main(int argc, char **argv)
     opal_set_using_threads(OMPI_HAVE_THREAD_SUPPORT);
 
     /* For malloc debugging */
-    ompi_malloc_init();
+    opal_malloc_init();
 
     /* Ensure the system_info structure is instantiated and initialized */
     if (ORTE_SUCCESS != (rc = orte_sys_info())) {
@@ -158,9 +158,9 @@ main(int argc, char **argv)
     orte_sys_info_finalize();
     orte_proc_info_finalize();
     mca_base_close();
-    ompi_malloc_finalize();
+    opal_malloc_finalize();
     opal_output_finalize();
-    ompi_class_finalize();
+    opal_class_finalize();
     
     fclose( test_out );
 /*    result = system( cmd_str );

test/mca/rds/Makefile.am

@@ -27,7 +27,8 @@ TESTS = \
 test_rds_SOURCES = test_rds.c
 test_rds_LDADD = \
         $(top_builddir)/test/support/libsupport.a \
-        $(top_builddir)/src/libmpi.la 
+        $(top_builddir)/orte/liborte.la \
+        $(top_builddir)/opal/libopal.la 
 test_rds_DEPENDENCIES = $(test_rds_LDADD)
 
 # JMS Temporarily commented out -- this test only checks the selection

test/mca/rds/test_rds.c

@@ -86,7 +86,7 @@ main(int argc, char **argv)
     opal_set_using_threads(OMPI_HAVE_THREAD_SUPPORT);
 
     /* For malloc debugging */
-    ompi_malloc_init();
+    opal_malloc_init();
 
     /* Ensure the system_info structure is instantiated and initialized */
     if (ORTE_SUCCESS != (rc = orte_sys_info())) {
@@ -198,9 +198,9 @@ main(int argc, char **argv)
     orte_sys_info_finalize();
     orte_proc_info_finalize();
     mca_base_close();
-    ompi_malloc_finalize();
+    opal_malloc_finalize();
     opal_output_finalize();
-    ompi_class_finalize();
+    opal_class_finalize();
     
     fclose( test_out );
 /*    result = system( cmd_str );

test/mca/rmaps/Makefile.am

@@ -27,5 +27,6 @@ TESTS = \
 test_rmaps_SOURCES = test_rmaps.c
 test_rmaps_LDADD = \
         $(top_builddir)/test/support/libsupport.a \
-        $(top_builddir)/src/libmpi.la 
+        $(top_builddir)/orte/liborte.la \
+        $(top_builddir)/opal/libopal.la 
 test_rmaps_DEPENDENCIES = $(test_rmaps_LDADD)

test/mca/rmaps/test_rmaps.c

@@ -80,7 +80,7 @@ main(int argc, char **argv)
     opal_set_using_threads(OMPI_HAVE_THREAD_SUPPORT);
 
     /* For malloc debugging */
-    ompi_malloc_init();
+    opal_malloc_init();
 
     /* Ensure the system_info structure is instantiated and initialized */
     if (ORTE_SUCCESS != (rc = orte_sys_info())) {
@@ -158,9 +158,9 @@ main(int argc, char **argv)
     orte_sys_info_finalize();
     orte_proc_info_finalize();
     mca_base_close();
-    ompi_malloc_finalize();
+    opal_malloc_finalize();
     opal_output_finalize();
-    ompi_class_finalize();
+    opal_class_finalize();
     
     fclose( test_out );
 /*    result = system( cmd_str );

test/mca/schema/Makefile.am

@@ -27,5 +27,6 @@ TESTS = \
 test_schema_SOURCES = test_schema.c
 test_schema_LDADD = \
         $(top_builddir)/test/support/libsupport.a \
-        $(top_builddir)/src/libmpi.la 
+        $(top_builddir)/orte/liborte.la \
+        $(top_builddir)/opal/libopal.la 
 test_schema_DEPENDENCIES = $(test_schema_LDADD)

test/runtime/Makefile.am

@@ -29,13 +29,15 @@ TESTS = \
 sigchld_SOURCES = \
 	sigchld.c
 sigchld_LDADD = \
-	$(top_builddir)/src/libmpi.la \
+	$(top_builddir)/orte/liborte.la \
+	$(top_builddir)/opal/libopal.la \
 	$(top_builddir)/test/support/libsupport.a
 sigchld_DEPENDENCIES = $(sigchld_LDADD)
 
 start_shut_SOURCES = \
     start_shut.c
 start_shut_LDADD = \
-    $(top_builddir)/src/libmpi.la \
-    $(top_builddir)/test/support/libsupport.a
+	$(top_builddir)/orte/liborte.la \
+	$(top_builddir)/opal/libopal.la \
+	$(top_builddir)/test/support/libsupport.a
 start_shut_DEPENDENCIES = $(start_shut_LDADD)

test/runtime/start_shut.c

@@ -15,7 +15,7 @@
  */
 
 #include "orte_config.h"
-#include "../src/include/orte_constants.h"
+#include "orte/include/orte_constants.h"
 
 
 #include <stdio.h>
@@ -29,7 +29,7 @@
 #endif
 
 #include "support.h"
-#include "../src/runtime/runtime.h"
+#include "orte/runtime/runtime.h"
 
 #define NUM_ITERS 3
 

test/threads/Makefile.am

@@ -29,12 +29,12 @@ TESTS = \
 opal_thread_SOURCES = opal_thread.c
 opal_thread_LDADD = \
         $(top_builddir)/test/support/libsupport.a \
-        $(top_builddir)/src/libmpi.la
+        $(top_builddir)/opal/libopal.la
 opal_thread_DEPENDENCIES = $(opal_thread_LDADD)
 
 opal_condition_SOURCES = opal_condition.c
 opal_condition_LDADD = \
         $(top_builddir)/test/support/libsupport.a \
-        $(top_builddir)/src/libmpi.la
+        $(top_builddir)/opal/libopal.la
 opal_condition_DEPENDENCIES = $(opal_condition_LDADD)
 

test/util/Makefile.am

@@ -23,66 +23,68 @@ check_PROGRAMS = \
 	opal_os_path \
 	orte_sys_info \
 	opal_os_create_dirpath \
-    orte_session_dir \
+	orte_session_dir \
 	opal_argv \
-    opal_basename \
-    orte_universe_setup_file_io
+	opal_basename \
+	orte_universe_setup_file_io
 
 TESTS = \
 	$(check_PROGRAMS)
 
 ompi_numtostr_SOURCES = ompi_numtostr.c
 ompi_numtostr_LDADD = \
-        $(top_builddir)/src/libmpi.la \
+        $(top_builddir)/opal/libopal.la \
         $(top_builddir)/test/support/libsupport.a 
 ompi_numtostr_DEPENDENCIES = $(ompi_numtostr_LDADD)
 
 opal_if_SOURCES = opal_if.c
 opal_if_LDADD = \
-        $(top_builddir)/src/libmpi.la \
+        $(top_builddir)/opal/libopal.la \
         $(top_builddir)/test/support/libsupport.a 
 opal_if_DEPENDENCIES = $(opal_if_LDADD)
 
 opal_argv_SOURCES = opal_argv.c
 opal_argv_LDADD = \
-        $(top_builddir)/src/libmpi.la \
+        $(top_builddir)/opal/libopal.la \
         $(top_builddir)/test/support/libsupport.a 
 opal_argv_DEPENDENCIES = $(opal_argv_LDADD)
 
 opal_basename_SOURCES = opal_basename.c
 opal_basename_LDADD = \
-        $(top_builddir)/src/libmpi.la \
+        $(top_builddir)/opal/libopal.la \
         $(top_builddir)/test/support/libsupport.a 
 opal_basename_DEPENDENCIES = $(opal_basename_LDADD)
 
 opal_os_path_SOURCES = opal_os_path.c
 opal_os_path_LDADD = \
-        $(top_builddir)/src/libmpi.la \
+        $(top_builddir)/opal/libopal.la \
         $(top_builddir)/test/support/libsupport.a 
 opal_os_path_DEPENDENCIES = $(opal_os_path_LDADD)
 
 
 orte_sys_info_SOURCES = orte_sys_info.c
 orte_sys_info_LDADD = \
-        $(top_builddir)/src/libmpi.la \
+        $(top_builddir)/opal/libopal.la \
         $(top_builddir)/test/support/libsupport.a 
 orte_sys_info_DEPENDENCIES = $(orte_sys_info_LDADD)
 
 opal_os_create_dirpath_SOURCES = opal_os_create_dirpath.c
 opal_os_create_dirpath_LDADD = \
-        $(top_builddir)/src/libmpi.la \
+        $(top_builddir)/opal/libopal.la \
         $(top_builddir)/test/support/libsupport.a 
 opal_os_create_dirpath_DEPENDENCIES = $(opal_os_create_dirpath_LDADD)
 
 orte_session_dir_SOURCES = orte_session_dir.c
 orte_session_dir_LDADD = \
-        $(top_builddir)/src/libmpi.la \
+        $(top_builddir)/orte/liborte.la \
+        $(top_builddir)/opal/libopal.la \
         $(top_builddir)/test/support/libsupport.a 
 orte_session_dir_DEPENDENCIES = $(orte_session_dir_LDADD)
 
 orte_universe_setup_file_io_SOURCES = orte_universe_setup_file_io.c
 orte_universe_setup_file_io_LDADD = \
-        $(top_builddir)/src/libmpi.la \
+        $(top_builddir)/orte/liborte.la \
+        $(top_builddir)/opal/libopal.la \
         $(top_builddir)/test/support/libsupport.a 
 orte_universe_setup_file_io_DEPENDENCIES = $(orte_universe_setup_file_io_LDADD)
 

test/util/opal_if.c

@@ -33,6 +33,7 @@
 #endif
 
 #include "runtime/runtime.h"
+#include "opal/runtime/opal.h"
 #include "opal/util/if.h"
 #include "support.h"
 #include "include/constants.h"
@@ -59,7 +60,7 @@ main(int argc, char *argv[])
 {
     char hostname[MAXHOSTNAMELEN];
 
-    orte_init();
+    opal_init();
     test_init("opal_if");
 
     /* 127.0.0.1 */
@@ -128,7 +129,7 @@ main(int argc, char *argv[])
     }
 
     test_finalize();
-    orte_finalize();
+    opal_finalize();
 
     return 0;
 }