Merge "ART: Fix test 089"

2 files changed, 5 insertions, 5 deletions

diff --git a/test/089-many-methods/check b/test/089-many-methods/check
index 594626a35a..65b71397b8 100755
--- a/test/089-many-methods/check
+++ b/test/089-many-methods/check
@@ -15,6 +15,6 @@
 # limitations under the License.
 
 # Strip build error debug messages, as they are environment-specific.
-sed -e '/^Failed to build/d' -e '/^Non-canonical tmpdir/d' -e '/^Args:/d' "$2" > "$2.tmp"
+sed -e '/^Failed to build/d' -e '/^Non-canonical tmpdir/d' -e '/^Args:/d' -e '/^Max filename/d' -e '/^Max pathlength/d' "$2" > "$2.tmp"
 
 diff --strip-trailing-cr -q "$1" "$2.tmp" >/dev/null
\ No newline at end of file
diff --git a/test/run-test b/test/run-test
index c4a629618c..945abb1535 100755
--- a/test/run-test
+++ b/test/run-test
@@ -528,10 +528,10 @@ else
         echo "Non-canonical tmpdir was ${noncanonical_tmp_dir}" >> "$output"
         echo "Args: ${args}" >> "$output"
         echo "build exit status: $build_exit" >> "$output"
-        echo "Max filename (NAME_MAX):" >> "$output"
-        getconf NAME_MAX ${tmp_dir} >> "$output"
-        echo "Max pathlength (PATH_MAX):" >> "$output"
-        getconf PATH_MAX ${tmp_dir} >> "$output"
+        max_name_length=$(getconf NAME_MAX ${tmp_dir})
+        echo "Max filename (NAME_MAX): ${max_name_length}" >> "$output"
+        max_path_length=$(getconf PATH_MAX ${tmp_dir})
+        echo "Max pathlength (PATH_MAX): ${max_path_lenght}" >> "$output"
     fi
     ./$check_cmd "$expected" "$output"
     if [ "$?" = "0" ]; then