From ecbd530a77879e2639fdeec6a2dca91401b50c54 Mon Sep 17 00:00:00 2001 From: Rainer Keller Date: Thu, 11 Feb 2010 22:07:07 +0000 Subject: [PATCH] - Well well, that's what one gets when turning on all kinds of old tests ;-)) Turn them off again, didn't have time to look into them Also, the test-program on eddie.osl.iu.edu, detects the rpc_pipefs mounted on /var/lib/nfs/rpc_pipefs, required for NFS. This commit was SVN r22607. --- test/util/Makefile.am | 138 ++++++++++++++++++++------------------ test/util/opal_path_nfs.c | 11 ++- 2 files changed, 81 insertions(+), 68 deletions(-) diff --git a/test/util/Makefile.am b/test/util/Makefile.am index e3bdfeacb6..1d927d56e2 100644 --- a/test/util/Makefile.am +++ b/test/util/Makefile.am @@ -18,49 +18,53 @@ AM_CPPFLAGS = -I$(top_srcdir)/test/support +#check_PROGRAMS = \ +# ompi_numtostr \ +# opal_error \ +# opal_if \ +# opal_os_path \ +# opal_timer \ +# opal_os_create_dirpath \ +# opal_argv \ +# opal_basename \ +# opal_path_nfs + + check_PROGRAMS = \ - ompi_numtostr \ - opal_error \ - opal_if \ - opal_os_path \ - opal_timer \ - opal_os_create_dirpath \ - opal_argv \ - opal_basename \ opal_path_nfs TESTS = \ $(check_PROGRAMS) -ompi_numtostr_SOURCES = ompi_numtostr.c -ompi_numtostr_LDADD = \ - $(top_builddir)/opal/libopen-pal.la \ - $(top_builddir)/test/support/libsupport.a -ompi_numtostr_DEPENDENCIES = $(ompi_numtostr_LDADD) +#ompi_numtostr_SOURCES = ompi_numtostr.c +#ompi_numtostr_LDADD = \ +# $(top_builddir)/opal/libopen-pal.la \ +# $(top_builddir)/test/support/libsupport.a +#ompi_numtostr_DEPENDENCIES = $(ompi_numtostr_LDADD) -opal_error_SOURCES = opal_error.c -opal_error_LDADD = \ - $(top_builddir)/orte/libopen-rte.la \ - $(top_builddir)/opal/libopen-pal.la -opal_error_DEPENDENCIES = $(opal_error_LDADD) +#opal_error_SOURCES = opal_error.c +#opal_error_LDADD = \ +# $(top_builddir)/orte/libopen-rte.la \ +# $(top_builddir)/opal/libopen-pal.la +#opal_error_DEPENDENCIES = $(opal_error_LDADD) -opal_if_SOURCES = opal_if.c -opal_if_LDADD = \ - $(top_builddir)/opal/libopen-pal.la \ - $(top_builddir)/test/support/libsupport.a -opal_if_DEPENDENCIES = $(opal_if_LDADD) +#opal_if_SOURCES = opal_if.c +#opal_if_LDADD = \ +# $(top_builddir)/opal/libopen-pal.la \ +# $(top_builddir)/test/support/libsupport.a +#opal_if_DEPENDENCIES = $(opal_if_LDADD) -opal_argv_SOURCES = opal_argv.c -opal_argv_LDADD = \ - $(top_builddir)/opal/libopen-pal.la \ - $(top_builddir)/test/support/libsupport.a -opal_argv_DEPENDENCIES = $(opal_argv_LDADD) +#opal_argv_SOURCES = opal_argv.c +#opal_argv_LDADD = \ +# $(top_builddir)/opal/libopen-pal.la \ +# $(top_builddir)/test/support/libsupport.a +#opal_argv_DEPENDENCIES = $(opal_argv_LDADD) -opal_basename_SOURCES = opal_basename.c -opal_basename_LDADD = \ - $(top_builddir)/opal/libopen-pal.la \ - $(top_builddir)/test/support/libsupport.a -opal_basename_DEPENDENCIES = $(opal_basename_LDADD) +#opal_basename_SOURCES = opal_basename.c +#opal_basename_LDADD = \ +# $(top_builddir)/opal/libopen-pal.la \ +# $(top_builddir)/test/support/libsupport.a +#opal_basename_DEPENDENCIES = $(opal_basename_LDADD) opal_path_nfs_SOURCES = opal_path_nfs.c opal_path_nfs_LDADD = \ @@ -68,45 +72,45 @@ opal_path_nfs_LDADD = \ $(top_builddir)/test/support/libsupport.a opal_path_nfs_DEPENDENCIES = $(opal_path_nfs_LDADD) -opal_os_path_SOURCES = opal_os_path.c -opal_os_path_LDADD = \ - $(top_builddir)/opal/libopen-pal.la \ - $(top_builddir)/test/support/libsupport.a -opal_os_path_DEPENDENCIES = $(opal_os_path_LDADD) +#opal_os_path_SOURCES = opal_os_path.c +#opal_os_path_LDADD = \ +# $(top_builddir)/opal/libopen-pal.la \ +# $(top_builddir)/test/support/libsupport.a +#opal_os_path_DEPENDENCIES = $(opal_os_path_LDADD) -opal_timer_SOURCES = opal_timer.c -opal_timer_LDADD = \ - $(top_builddir)/opal/libopen-pal.la \ - $(top_builddir)/test/support/libsupport.a -opal_timer_DEPENDENCIES = $(opal_timer_LDADD) +#opal_timer_SOURCES = opal_timer.c +#opal_timer_LDADD = \ +# $(top_builddir)/opal/libopen-pal.la \ +# $(top_builddir)/test/support/libsupport.a +#opal_timer_DEPENDENCIES = $(opal_timer_LDADD) -# orte_sys_info_SOURCES = orte_sys_info.c -# orte_sys_info_LDADD = \ -# $(top_builddir)/orte/libopen-rte.la \ -# $(top_builddir)/opal/libopen-pal.la \ -# $(top_builddir)/test/support/libsupport.a -# orte_sys_info_DEPENDENCIES = $(orte_sys_info_LDADD) +#orte_sys_info_SOURCES = orte_sys_info.c +#orte_sys_info_LDADD = \ +# $(top_builddir)/orte/libopen-rte.la \ +# $(top_builddir)/opal/libopen-pal.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)/opal/libopen-pal.la \ - $(top_builddir)/test/support/libsupport.a -opal_os_create_dirpath_DEPENDENCIES = $(opal_os_create_dirpath_LDADD) +#opal_os_create_dirpath_SOURCES = opal_os_create_dirpath.c +#opal_os_create_dirpath_LDADD = \ +# $(top_builddir)/opal/libopen-pal.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)/orte/libopen-rte.la \ -# $(top_builddir)/opal/libopen-pal.la \ -# $(top_builddir)/test/support/libsupport.a -# orte_session_dir_DEPENDENCIES = $(orte_session_dir_LDADD) +#orte_session_dir_SOURCES = orte_session_dir.c +#orte_session_dir_LDADD = \ +# $(top_builddir)/orte/libopen-rte.la \ +# $(top_builddir)/opal/libopen-pal.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)/orte/libopen-rte.la \ -# $(top_builddir)/opal/libopen-pal.la \ -# $(top_builddir)/test/support/libsupport.a -# orte_universe_setup_file_io_DEPENDENCIES = $(orte_universe_setup_file_io_LDADD) +#orte_universe_setup_file_io_SOURCES = orte_universe_setup_file_io.c +#orte_universe_setup_file_io_LDADD = \ +# $(top_builddir)/orte/libopen-rte.la \ +# $(top_builddir)/opal/libopen-pal.la \ +# $(top_builddir)/test/support/libsupport.a +#orte_universe_setup_file_io_DEPENDENCIES = $(orte_universe_setup_file_io_LDADD) clean-local: - rm -f test_session_dir_out test-file + rm -f test_session_dir_out test-file opal_path_nfs.out diff --git a/test/util/opal_path_nfs.c b/test/util/opal_path_nfs.c index 29f67fd558..2b72b4ff37 100644 --- a/test/util/opal_path_nfs.c +++ b/test/util/opal_path_nfs.c @@ -66,7 +66,7 @@ int main(int argc, char* argv[]) #ifdef __WINDOWS__ #endif - + /* All done */ return test_finalize(); } @@ -121,6 +121,15 @@ void get_mounts (int * num_dirs, char ** dirs[], bool * nfs[]) if (2 != (rc = sscanf (buffer, "%s %s\n", dirs_tmp[i], fs))) { goto out; } + + /* + * rpc_pipefs is a FS mounted on /var/lib/nfs/rpc_pipefs for NFS4 + * Cannot distinguish it from NFS in opal_path_nfs, therefore just + * disregard it, as it is NOT an parallel filesystem... + */ + if (0 == strcasecmp (fs, "rpc_pipefs")) + continue; + nfs_tmp[i] = false; if (0 == strcasecmp (fs, "nfs") || 0 == strcasecmp (fs, "lustre") ||