Merge pull request #7167 from raffenet/move-mydef

build: Move benchmark generation to test/mpi/autogen.sh

Approved-by: Hui Zhou

autogen.sh

@@ -65,7 +65,6 @@ do_hydra=yes
 do_romio=yes
 do_pmi=yes
 do_doc=no
-do_mydef=yes
 
 yaksa_depth=
 
@@ -537,14 +536,6 @@ fn_json_gen() {
     echo "done"
 }
 
-fn_mydef() {
-    MYDEF_BOOT=$PWD/modules/mydef_boot
-    export PATH=$MYDEF_BOOT/bin:$PATH
-    export PERL5LIB=$MYDEF_BOOT/lib/perl5
-    export MYDEFLIB=$MYDEF_BOOT/lib/MyDef
-    (cd test/mpi/bench && ./autogen.sh)
-}
-
 # internal
 _patch_libtool() {
     _file=$1
@@ -1111,5 +1102,3 @@ fn_build_configure
 fn_ch4_api
 
 fn_json_gen
-
-fn_mydef

test/mpi/autogen.sh

@@ -62,6 +62,17 @@ check_copy() {
     fi
 }
 
+generate_benchmarks() {
+    MYDEF_BOOT=$PWD/../../modules/mydef_boot
+    if test -d $MYDEF_BOOT ; then
+        echo "Generating benchmark tests"
+        export PATH=$MYDEF_BOOT/bin:$PATH
+        export PERL5LIB=$MYDEF_BOOT/lib/perl5
+        export MYDEFLIB=$MYDEF_BOOT/lib/MyDef
+        (cd bench && ./autogen.sh)
+    fi
+}
+
 check_copy version.m4     ../../maint/version.m4
 check_copy confdb         ../../confdb
 check_copy dtpools/confdb ../../confdb
@@ -78,6 +89,9 @@ if test ! -e include/mtest_mpix.h ; then
     touch include/mtest_mpix.h
 fi
 
+# Generate the benchmark tests
+generate_benchmarks
+
 echo "Running autoreconf in dtpools"
 (cd dtpools && autoreconf -ivf)