Shorten more file names to cirucmvent make problem

Doxyfile.in

@@ -854,11 +854,11 @@ EXCLUDE                = @top_srcdir@/src/elpa1_compute.F90 \
 			 @top_srcdir@/src/ftimings/resident_set_size.c \
 			 @top_srcdir@/src/ftimings/time.c \
 			 @top_srcdir@/src/ftimings/virtual_memory.c \
-			 @top_srcdir@/test/shared_sources/mod_output_types.F90 \
-			 @top_srcdir@/test/c/elpa1_test_complex_c_version.c \
-			 @top_srcdir@/test/c/elpa1_test_real_c_version.c \
-			 @top_srcdir@/test/c/elpa2_test_complex_c_version.c \
-			 @top_srcdir@/test/c/elpa2_test_real_c_version.c \
+			 @top_srcdir@/test/shared/mod_output_types.F90 \
+			 @top_srcdir@/test/C/elpa1_test_complex_c_version.c \
+			 @top_srcdir@/test/C/elpa1_test_real_c_version.c \
+			 @top_srcdir@/test/C/elpa2_test_complex_c_version.c \
+			 @top_srcdir@/test/C/elpa2_test_real_c_version.c \
 			 @top_srcdir@/test/Fortran/read_real.F90 \
 			 @top_srcdir@/test/Fortran/test_complex2_choose_kernel_with_api.F90 \
 			 @top_srcdir@/test/Fortran/test_complex2_default_kernel.F90 \
@@ -870,17 +870,17 @@ EXCLUDE                = @top_srcdir@/src/elpa1_compute.F90 \
 			 @top_srcdir@/test/Fortran/test_real2.F90 \
 			 @top_srcdir@/test/Fortran/test_real.F90 \
 			 @top_srcdir@/test/Fortran/test_real_with_c.F90 \
-			 @top_srcdir@/test/shared_sources/blacs_infrastructure.F90 \
-			 @top_srcdir@/test/shared_sources/call_elpa1.c \
-			 @top_srcdir@/test/shared_sources/call_elpa2.c \
-			 @top_srcdir@/test/shared_sources/check_correctnes.F90 \
-			 @top_srcdir@/test/shared_sources/mod_from_c.F90 \
-			 @top_srcdir@/test/shared_sources/prepare_matrix.F90 \
-			 @top_srcdir@/test/shared_sources/read_input_parameters.F90 \
-			 @top_srcdir@/test/shared_sources/redir.c \
-			 @top_srcdir@/test/shared_sources/redirect.F90 \
-			 @top_srcdir@/test/shared_sources/setup_mpi.F90 \
-			 @top_srcdir@/test/shared_sources/util.F90
+			 @top_srcdir@/test/shared/blacs_infrastructure.F90 \
+			 @top_srcdir@/test/shared/call_elpa1.c \
+			 @top_srcdir@/test/shared/call_elpa2.c \
+			 @top_srcdir@/test/shared/check_correctnes.F90 \
+			 @top_srcdir@/test/shared/mod_from_c.F90 \
+			 @top_srcdir@/test/shared/prepare_matrix.F90 \
+			 @top_srcdir@/test/shared/read_input_parameters.F90 \
+			 @top_srcdir@/test/shared/redir.c \
+			 @top_srcdir@/test/shared/redirect.F90 \
+			 @top_srcdir@/test/shared/setup_mpi.F90 \
+			 @top_srcdir@/test/shared/util.F90
 
 # The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
 # directories that are symbolic links (a Unix file system feature) are excluded

Makefile.am

@@ -186,11 +186,11 @@ filesdir = $(docdir)/examples
 dist_files_DATA = \
   test/Fortran/read_real.F90 \
   test/Fortran/test_complex2.F90 \
-  test/Fortran/test_complex2_default_kernel.F90 \
+  test/Fortran/test_complex2_default.F90 \
   test/Fortran/test_complex2_api.F90 \
   test/Fortran/test_complex.F90 \
   test/Fortran/test_real2.F90 \
-  test/Fortran/test_real2_default_kernel.F90 \
+  test/Fortran/test_real2_default.F90 \
   test/Fortran/test_real2_qr.F90 \
   test/Fortran/test_real2_api.F90 \
   test/Fortran/test_real.F90 \
@@ -213,12 +213,12 @@ noinst_PROGRAMS = \
   elpa1_test_complex@SUFFIX@ \
   elpa2_test_real@SUFFIX@ \
   elpa2_test_complex@SUFFIX@ \
-  elpa2_test_real_default_kernel@SUFFIX@ \
-  elpa2_test_real_default_kernel_qr_decomposition@SUFFIX@ \
-  elpa2_test_complex_default_kernel@SUFFIX@ \
-  elpa2_test_real_choose_kernel_with_api@SUFFIX@ \
-  elpa2_test_complex_choose_kernel_with_api@SUFFIX@ \
-  elpa1_test_real_toeplitz_matrix@SUFFIX@ \
+  elpa2_test_real_default@SUFFIX@ \
+  elpa2_test_real_qr@SUFFIX@ \
+  elpa2_test_complex_default@SUFFIX@ \
+  elpa2_test_real_api@SUFFIX@ \
+  elpa2_test_complex_api@SUFFIX@ \
+  elpa1_real_toeplitz@SUFFIX@ \
   elpa1_test_real_with_c@SUFFIX@
 if !WITH_OPENMP
 noinst_PROGRAMS += \
@@ -234,20 +234,20 @@ build_lib = libelpa@SUFFIX@.la libelpatest@SUFFIX@.la
 noinst_LTLIBRARIES += libelpatest@SUFFIX@.la
 libelpatest@SUFFIX@_la_FCFLAGS = $(AM_FCFLAGS) @FC_MODOUT@private_modules @FC_MODINC@private_modules
 libelpatest@SUFFIX@_la_SOURCES = \
-	test/shared_sources/util.F90 \
-	test/shared_sources/read_input_parameters.F90  \
-	test/shared_sources/check_correctnes.F90 \
-	test/shared_sources/setup_mpi.F90 \
-	test/shared_sources/blacs_infrastructure.F90 \
-	test/shared_sources/prepare_matrix.F90 \
-	test/shared_sources/mod_output_types.F90 \
-	test/shared_sources/mod_from_c.F90 \
-	test/shared_sources/call_elpa1.c
+	test/shared/util.F90 \
+	test/shared/read_input_parameters.F90  \
+	test/shared/check_correctnes.F90 \
+	test/shared/setup_mpi.F90 \
+	test/shared/blacs_infrastructure.F90 \
+	test/shared/prepare_matrix.F90 \
+	test/shared/mod_output_types.F90 \
+	test/shared/mod_from_c.F90 \
+	test/shared/call_elpa1.c
 
 if HAVE_REDIRECT
 libelpatest@SUFFIX@_la_SOURCES += \
-	test/shared_sources/redir.c \
-	test/shared_sources/redirect.F90
+	test/shared/redir.c \
+	test/shared/redirect.F90
 endif
 
 if !WITH_OPENMP
@@ -281,10 +281,10 @@ elpa1_test_real@SUFFIX@_LDADD = $(build_lib)
 elpa1_test_real@SUFFIX@_FCFLAGS = $(AM_FCFLAGS) @FC_MODOUT@private_modules @FC_MODINC@private_modules
 EXTRA_elpa1_test_real@SUFFIX@_DEPENDENCIES = test/Fortran/elpa_print_headers.X90
 
-elpa1_test_real_toeplitz_matrix@SUFFIX@_SOURCES = test/Fortran/test_toeplitz.F90
-elpa1_test_real_toeplitz_matrix@SUFFIX@_LDADD = $(build_lib)
-elpa1_test_real_toeplitz_matrix@SUFFIX@_FCFLAGS = $(AM_FCFLAGS) @FC_MODOUT@private_modules @FC_MODINC@private_modules
-EXTRA_elpa1_test_real_toeplitz_matrix@SUFFIX@_DEPENDENCIES = test/Fortran/elpa_print_headers.X90
+elpa1_real_toeplitz@SUFFIX@_SOURCES = test/Fortran/test_toeplitz.F90
+elpa1_real_toeplitz@SUFFIX@_LDADD = $(build_lib)
+elpa1_real_toeplitz@SUFFIX@_FCFLAGS = $(AM_FCFLAGS) @FC_MODOUT@private_modules @FC_MODINC@private_modules
+EXTRA_elpa1_real_toeplitz@SUFFIX@_DEPENDENCIES = test/Fortran/elpa_print_headers.X90
 
 elpa1_test_real_with_c@SUFFIX@_SOURCES = test/Fortran/test_real_with_c.F90
 elpa1_test_real_with_c@SUFFIX@_LDADD = $(build_lib)
@@ -296,21 +296,21 @@ elpa2_test_real@SUFFIX@_LDADD = $(build_lib)
 elpa2_test_real@SUFFIX@_FCFLAGS = $(AM_FCFLAGS) @FC_MODOUT@private_modules @FC_MODINC@private_modules
 EXTRA_elpa2_test_real@SUFFIX@_DEPENDENCIES = test/Fortran/elpa_print_headers.X90
 
-elpa2_test_real_default_kernel@SUFFIX@_SOURCES = test/Fortran/test_real2_default_kernel.F90
-elpa2_test_real_default_kernel@SUFFIX@_LDADD = $(build_lib)
-elpa2_test_real_default_kernel@SUFFIX@_FCFLAGS = $(AM_FCFLAGS) @FC_MODOUT@private_modules @FC_MODINC@private_modules
-EXTRA_elpa2_test_real_default_kernel@SUFFIX@_DEPENDENCIES = test/Fortran/elpa_print_headers.X90
+elpa2_test_real_default@SUFFIX@_SOURCES = test/Fortran/test_real2_default.F90
+elpa2_test_real_default@SUFFIX@_LDADD = $(build_lib)
+elpa2_test_real_default@SUFFIX@_FCFLAGS = $(AM_FCFLAGS) @FC_MODOUT@private_modules @FC_MODINC@private_modules
+EXTRA_elpa2_test_real_default@SUFFIX@_DEPENDENCIES = test/Fortran/elpa_print_headers.X90
 
 
-elpa2_test_real_default_kernel_qr_decomposition@SUFFIX@_SOURCES = test/Fortran/test_real2_qr.F90
-elpa2_test_real_default_kernel_qr_decomposition@SUFFIX@_LDADD = $(build_lib)
-elpa2_test_real_default_kernel_qr_decomposition@SUFFIX@_FCFLAGS = $(AM_FCFLAGS) @FC_MODOUT@private_modules @FC_MODINC@private_modules
-EXTRA_elpa2_test_real_default_kernel_qr_decomposition@SUFFIX@_DEPENDENCIES = test/Fortran/elpa_print_headers.X90
+elpa2_test_real_qr@SUFFIX@_SOURCES = test/Fortran/test_real2_qr.F90
+elpa2_test_real_qr@SUFFIX@_LDADD = $(build_lib)
+elpa2_test_real_qr@SUFFIX@_FCFLAGS = $(AM_FCFLAGS) @FC_MODOUT@private_modules @FC_MODINC@private_modules
+EXTRA_elpa2_test_real_qr@SUFFIX@_DEPENDENCIES = test/Fortran/elpa_print_headers.X90
 
-elpa2_test_real_choose_kernel_with_api@SUFFIX@_SOURCES = test/Fortran/test_real2_api.F90
-elpa2_test_real_choose_kernel_with_api@SUFFIX@_LDADD = $(build_lib)
-elpa2_test_real_choose_kernel_with_api@SUFFIX@_FCFLAGS = $(AM_FCFLAGS) @FC_MODOUT@private_modules @FC_MODINC@private_modules
-EXTRA_elpa2_test_real_choose_kernel_with_api@SUFFIX@_DEPENDENCIES = test/Fortran/elpa_print_headers.X90
+elpa2_test_real_api@SUFFIX@_SOURCES = test/Fortran/test_real2_api.F90
+elpa2_test_real_api@SUFFIX@_LDADD = $(build_lib)
+elpa2_test_real_api@SUFFIX@_FCFLAGS = $(AM_FCFLAGS) @FC_MODOUT@private_modules @FC_MODINC@private_modules
+EXTRA_elpa2_test_api@SUFFIX@_DEPENDENCIES = test/Fortran/elpa_print_headers.X90
 
 elpa1_test_complex@SUFFIX@_SOURCES = test/Fortran/test_complex.F90
 elpa1_test_complex@SUFFIX@_LDADD = $(build_lib)
@@ -323,15 +323,15 @@ elpa2_test_complex@SUFFIX@_LDADD = $(build_lib)
 elpa2_test_complex@SUFFIX@_FCFLAGS = $(AM_FCFLAGS) @FC_MODOUT@private_modules @FC_MODINC@private_modules
 EXTRA_elpa2_test_complex@SUFFIX@_DEPENDENCIES = test/Fortran/elpa_print_headers.X90
 
-elpa2_test_complex_default_kernel@SUFFIX@_SOURCES = test/Fortran/test_complex2_default_kernel.F90
-elpa2_test_complex_default_kernel@SUFFIX@_LDADD = $(build_lib)
-elpa2_test_complex_default_kernel@SUFFIX@_FCFLAGS = $(AM_FCFLAGS) @FC_MODOUT@private_modules @FC_MODINC@private_modules
-EXTRA_elpa2_test_complex_default_kernel@SUFFIX@_DEPENDENCIES = test/Fortran/elpa_print_headers.X90
+elpa2_test_complex_default@SUFFIX@_SOURCES = test/Fortran/test_complex2_default.F90
+elpa2_test_complex_default@SUFFIX@_LDADD = $(build_lib)
+elpa2_test_complex_default@SUFFIX@_FCFLAGS = $(AM_FCFLAGS) @FC_MODOUT@private_modules @FC_MODINC@private_modules
+EXTRA_elpa2_test_complex_default@SUFFIX@_DEPENDENCIES = test/Fortran/elpa_print_headers.X90
 
-elpa2_test_complex_choose_kernel_with_api@SUFFIX@_SOURCES = test/Fortran/test_complex2_api.F90
-elpa2_test_complex_choose_kernel_with_api@SUFFIX@_LDADD = $(build_lib)
-elpa2_test_complex_choose_kernel_with_api@SUFFIX@_FCFLAGS = $(AM_FCFLAGS) @FC_MODOUT@private_modules @FC_MODINC@private_modules
-EXTRA_elpa2_test_complex_choose_kernel_with_api@SUFFIX@_DEPENDENCIES = test/Fortran/elpa_print_headers.X90
+elpa2_test_complex_api@SUFFIX@_SOURCES = test/Fortran/test_complex2_api.F90
+elpa2_test_complex_api@SUFFIX@_LDADD = $(build_lib)
+elpa2_test_complex_api@SUFFIX@_FCFLAGS = $(AM_FCFLAGS) @FC_MODOUT@private_modules @FC_MODINC@private_modules
+EXTRA_elpa2_test_complex_api@SUFFIX@_DEPENDENCIES = test/Fortran/elpa_print_headers.X90
 
 elpa2_print_kernels@SUFFIX@_SOURCES = src/elpa2_print_kernels.F90
 elpa2_print_kernels@SUFFIX@_LDADD = $(build_lib)
@@ -341,14 +341,14 @@ check_SCRIPTS = \
   elpa1_test_real@SUFFIX@.sh \
   elpa1_test_real_with_c@SUFFIX@.sh \
   elpa2_test_real@SUFFIX@.sh \
-  elpa2_test_real_default_kernel@SUFFIX@.sh \
+  elpa2_test_real_default@SUFFIX@.sh \
   elpa1_test_complex@SUFFIX@.sh \
   elpa2_test_complex@SUFFIX@.sh \
-  elpa2_test_real_default_kernel_qr_decomposition@SUFFIX@.sh \
-  elpa2_test_complex_default_kernel@SUFFIX@.sh \
-  elpa2_test_real_choose_kernel_with_api@SUFFIX@.sh \
-  elpa2_test_complex_choose_kernel_with_api@SUFFIX@.sh \
-  elpa1_test_real_toeplitz_matrix@SUFFIX@.sh \
+  elpa2_test_real_qr@SUFFIX@.sh \
+  elpa2_test_complex_default@SUFFIX@.sh \
+  elpa2_test_real_api@SUFFIX@.sh \
+  elpa2_test_complex_api@SUFFIX@.sh \
+  elpa1_real_toeplitz@SUFFIX@.sh \
   elpa2_print_kernels@SUFFIX@
 
 

generated_headers.am

@@ -6,7 +6,7 @@ endef
 elpa test:
 	@mkdir $@
 
-test/shared_sources: | test
+test/shared: | test
 	@mkdir $@
 
 config-f90.h: config.h
@@ -16,12 +16,12 @@ config-f90.h: config.h
 elpa/elpa_generated.h: $(top_srcdir)/src/elpa_c_interface.F90 | elpa
 	$(call extract_interface,!c>)
 
-test/shared_sources/generated.h: $(wildcard $(top_srcdir)/test/shared_sources/*.F90) | test/shared_sources
+test/shared/generated.h: $(wildcard $(top_srcdir)/test/shared/*.F90) | test/shared
 	$(call extract_interface,!c>)
 
 elpa/elpa_generated_fortran_interfaces.h: $(wildcard $(top_srcdir)/src/elpa2_kernels/*.c) $(wildcard $(top_srcdir)/src/elpa2_kernels/*.s) | elpa
 	$(call extract_interface,!f>)
 	$(call extract_interface,#!f>)
 
-generated_headers= config-f90.h elpa/elpa_generated.h test/shared_sources/generated.h elpa/elpa_generated_fortran_interfaces.h
+generated_headers= config-f90.h elpa/elpa_generated.h test/shared/generated.h elpa/elpa_generated_fortran_interfaces.h
 generated-headers: $(generated_headers)

test/C/elpa1_test_complex_c_version.c

@@ -51,7 +51,7 @@
 #include <math.h>
 
 #include <elpa/elpa.h>
-#include <test/shared_sources/generated.h>
+#include <test/shared/generated.h>
 #include <complex.h>
 
 int main(int argc, char** argv) {

test/C/elpa1_test_real_c_version.c

@@ -52,7 +52,7 @@
 
 #include <elpa/elpa.h>
 
-#include "test/shared_sources/generated.h"
+#include "test/shared/generated.h"
 
 int main(int argc, char** argv) {
    int myid;

test/C/elpa2_test_complex_c_version.c

@@ -51,7 +51,7 @@
 #include <math.h>
 
 #include <elpa/elpa.h>
-#include <test/shared_sources/generated.h>
+#include <test/shared/generated.h>
 #include <complex.h>
 
 int main(int argc, char** argv) {

test/C/elpa2_test_real_c_version.c

@@ -51,7 +51,7 @@
 #include <math.h>
 
 #include <elpa/elpa.h>
-#include <test/shared_sources/generated.h>
+#include <test/shared/generated.h>
 
 int main(int argc, char** argv) {
    int myid;