From 3adc1c8d64dacce60fea1148531419bacb33037c Mon Sep 17 00:00:00 2001
From: Ruipeng Li <li50@llnl.gov>
Date: Mon, 24 Sep 2018 14:30:38 -0700
Subject: [PATCH] fix bugs in test link c++

---
 AUTOTEST/link.filters   | 1 -
 AUTOTEST/machine-tux.sh | 5 +++++
 src/test/fei.cxx        | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/AUTOTEST/link.filters b/AUTOTEST/link.filters
index 0699dde2b..4bb3bc873 100644
--- a/AUTOTEST/link.filters
+++ b/AUTOTEST/link.filters
@@ -2,4 +2,3 @@ End of Compilation
 Compilation successful for file
 Additional optimization may be attained by recompiling and specifying MAXMEM option with a value greater than 8192.
 The device linker only supports static linking.  Any device code placed into a shared library by the qmkshrobj option will be inaccessible.
-
diff --git a/AUTOTEST/machine-tux.sh b/AUTOTEST/machine-tux.sh
index 652c92435..8ce2a6a56 100755
--- a/AUTOTEST/machine-tux.sh
+++ b/AUTOTEST/machine-tux.sh
@@ -62,15 +62,20 @@ co=""
 ./test.sh basic.sh $src_dir -co: $co -mo: $mo
 ./renametest.sh basic $output_dir/basic-default
 
+eval ./test.sh configure.sh $src_dir $co
+eval ./test.sh make.sh      $src_dir $mo
 # Test linking for different languages (depends on previous compile test)
 link_opts="all++ all77"
 for opt in $link_opts
 do
    output_subdir=$output_dir/link$opt
    mkdir -p $output_subdir
+   cp -r configure.??? make.??? $output_subdir
    ./test.sh link.sh $src_dir $opt
    mv -f link.??? $output_subdir
 done
+rm -rf configure.??? make.???
+( cd $src_dir; make distclean )
 
 co="--without-MPI"
 ./test.sh basic.sh $src_dir -co: $co -mo: $mo
diff --git a/src/test/fei.cxx b/src/test/fei.cxx
index 23dbd7935..bc63fe684 100644
--- a/src/test/fei.cxx
+++ b/src/test/fei.cxx
@@ -469,7 +469,7 @@ HYPRE_Int composeSharedNodes(HYPRE_Int nElems, HYPRE_Int elemNNodes, HYPRE_Int *
                sharedIDs[nShared++] = index;
          }
       }
-      qsort0(sharedIDs, 0, nShared-1);
+      hypre_qsort0(sharedIDs, 0, nShared-1);
       ncnt = 1;
       for (i = 1; i < nShared; i++)
       {