diff --git a/test/runtime/Makefile.am b/test/runtime/Makefile.am index 21c62f9f9c..503f471e3c 100644 --- a/test/runtime/Makefile.am +++ b/test/runtime/Makefile.am @@ -20,22 +20,11 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/test/support check_PROGRAMS = \ - sigchld \ - parse_context + sigchld TESTS = \ $(check_PROGRAMS) -parse_context_SOURCES = \ - parse_context.c -parse_context_LDADD = \ - $(top_builddir)/src/libmpi.la \ - $(top_builddir)/test/support/libsupport.a - -parse_context_LDFLAGS = $(LIBMPI_EXTRA_LDFLAGS) -parse_context_DEPENDENCIES = $(parse_context_LDADD) - - sigchld_SOURCES = \ sigchld.c sigchld_LDADD = \ diff --git a/test/runtime/parse_context.c b/test/runtime/parse_context.c deleted file mode 100644 index 99a2506b34..0000000000 --- a/test/runtime/parse_context.c +++ /dev/null @@ -1,124 +0,0 @@ -/* - * Copyright (c) 2004-2005 The Trustees of Indiana University. - * All rights reserved. - * Copyright (c) 2004-2005 The Trustees of the University of Tennessee. - * All rights reserved. - * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, - * University of Stuttgart. All rights reserved. - * Copyright (c) 2004-2005 The Regents of the University of California. - * All rights reserved. - * $COPYRIGHT$ - * - * Additional copyrights may follow - * - * $HEADER$ - */ -/** @file: - * - * parse_context - unit test - * - */ - -/* - * includes - */ - -#include "orte_config.h" - -#include "support.h" - -#include "util/cmd_line.h" -#include "mca/base/base.h" -#include "mca/base/mca_base_param.h" - -#include "runtime/runtime.h" - -/* output files needed by the test */ -static FILE *test_out=NULL; - -static char *cmd_str="diff ./test_parse_context_out ./test_parse_context_out_std"; - -void context_test(void *value, int instance, int param); - -bool context_help; - -orte_context_value_names_t test_context_tbl[] = { - /* start with usual help and version stuff */ - {{NULL, NULL, NULL}, "dummy", 2, ORTE_INT, (void*)&context_help, (void*)false, context_test}, - {{NULL, NULL, NULL}, NULL, 0, ORTE_NULL, NULL, NULL, NULL} /* terminate the table */ -}; - -int main(int argc, char **argv) -{ - int ret; - ompi_cmd_line_t *cmd_line; - - test_init("test_gpr_replica"); - - /* test_out = fopen( "test_parse_context_out", "w+" ); */ - test_out = stderr; - if( test_out == NULL ) { - test_failure("parse_context_test couldn't open test file failed"); - test_finalize(); - exit(1); - } - - cmd_line = OBJ_NEW(ompi_cmd_line_t); - - ompi_init(argc, argv); - - /* startup the MCA */ - if (OMPI_SUCCESS == mca_base_open()) { - fprintf(test_out, "MCA started\n"); - } else { - fprintf(test_out, "MCA could not start\n"); - exit (1); - } - - /* - * setup mca command line arguments - */ - if (OMPI_SUCCESS != (ret = mca_base_cmd_line_setup(cmd_line))) { - fprintf(test_out, "mca_cmd_line_setup: failed\n"); - exit (ret); - } - - if (OMPI_SUCCESS != mca_base_cmd_line_process_args(cmd_line)) { - fprintf(test_out, "mca_cmd_line_process_args: failed\n"); - exit (ret); - } - - /* parse the cmd line */ - if (OMPI_SUCCESS != ompi_cmd_line_parse(cmd_line, true, argc, argv)) { - fprintf(test_out, "cmd_line_parse: failed\n"); - exit(1); - } - - /* set some MCA parameters in environment */ - setenv("OMPI_MCA_seed", "0", 1); - setenv("OMPI_MCA_ns_replica_uri", "ding-dong", 1); - if (ORTE_SUCCESS != orte_parse_proc_context(cmd_line, argc, argv)) { - fprintf(test_out, "parse_proc_context: failed\n"); - exit(1); - } - - fprintf(test_out, "seed flag %d\n", (int)orte_process_info.seed); - fprintf(test_out, "nsreplica %s\n", orte_process_info.ns_replica_uri); - - /* parse test context */ - if (ORTE_SUCCESS != orte_parse_context(test_context_tbl, cmd_line, argc, argv)) { - fprintf(test_out, "parse test context tbl failed\n"); - exit(1); - } - - test_finalize(); - - return(0); -} - -void context_test(void *value, int instance, int param) -{ - fprintf(test_out, "context callback function called\n"); - fprintf(test_out, "\tvalue %d instance %d param %d\n", *((int*)value), - instance, param); -} diff --git a/test/runtime/sigchld.c b/test/runtime/sigchld.c index 87c4bb32e9..ace47d97de 100644 --- a/test/runtime/sigchld.c +++ b/test/runtime/sigchld.c @@ -31,16 +31,14 @@ int count = 0; -static void -callback(pid_t pid, int status, void *data) +static void callback(pid_t pid, int status, void *data) { printf("callback for %d, %d\n", pid, status); count--; } -int -main(int argc, char *argv[]) +int main(int argc, char *argv[]) { pid_t pid, ret; int status = -1; @@ -50,35 +48,41 @@ main(int argc, char *argv[]) pid = fork(); if (pid > 0) { count++; + printf("parent launched child #1 PID %d\n", pid); orte_wait_cb(pid, callback, NULL); } else { + printf("child pid %d sleeping 10 seconds\n", getpid()); sleep(10); - printf("pid %d exiting\n", getpid()); + printf("pid %d exiting after sleeping 10 seconds\n", getpid()); exit(0); } pid = fork(); if (pid > 0) { + printf("parent launched child #2 PID %d\n", pid); ret = orte_waitpid(pid, &status, 0); printf("pid %d waitpid, status %d\n", ret, status); } else { + printf("child pid %d sleeping 5 seconds\n", getpid()); sleep(5); - printf("pid %d exiting\n", getpid()); + printf("pid %d exiting after sleeping 5 seconds\n", getpid()); exit(0); } pid = fork(); if (pid > 0) { count++; + printf("parent launched child #3 PID %d\n", pid); orte_wait_cb(pid, callback, NULL); } else { - printf("pid %d exiting\n", getpid()); + printf("pid %d exiting after not sleeping at all\n", getpid()); exit(0); } - while (count > 0) { ompi_progress(); } + while (count > 0) { + ompi_progress(); + } orte_finalize(); - return 0; }