trace2: use system/global config for default trace2 settings

diff --git a/t/t9802-git-p4-filetype.sh b/t/t9802-git-p4-filetype.sh
index eb9a8ed197b4c6383a4c688f5e5c3a3fcb102b12..9978352d7828dbd63d44d172b91193a20291c4d1 100755 (executable)
--- a/t/t9802-git-p4-filetype.sh
+++ b/t/t9802-git-p4-filetype.sh
@@ -237,7 +237,7 @@ test_expect_success 'ignore apple' '
        build_gendouble &&
        (
                cd "$cli" &&
-               test-genrandom apple 1024 >double.png &&
+               test-tool genrandom apple 1024 >double.png &&
                "$PYTHON_PATH" "$TRASH_DIRECTORY/gendouble.py" >%double.png &&
                p4 add -t apple double.png &&
                p4 submit -d appledouble
@@ -310,7 +310,7 @@ test_expect_success SYMLINKS 'empty symlink target' '
                # p4 to sync here will make it generate errors.
                cd "$cli" &&
                p4 print -q //depot/empty-symlink#2 >out &&
-               test ! -s out
+               test_must_be_empty out
        ) &&
        test_when_finished cleanup_git &&