Use diff wrapper

40 files changed, 47 insertions, 47 deletions

diff --git a/tests/_self-adaptive/test_context_empty.sh b/tests/_self-adaptive/test_context_empty.sh
index 463a313..01a2301 100644
--- a/tests/_self-adaptive/test_context_empty.sh
+++ b/tests/_self-adaptive/test_context_empty.sh
@@ -14,7 +14,7 @@ $MRT_MARIAN/build/marian-adaptive \
   -t ubuntu.nocontext.src ubuntu.nocontext.ref --log nocontext.log < ubuntu.src > nocontext.out
 
 # Check outputs
-diff nocontext.out nocontext.expected > nocontext.diff
+$MRT_TOOLS/diff.sh nocontext.out nocontext.expected > nocontext.diff
 
 # Check if the log file does not contain training logs
 grep -q "Ep\." nocontext.log && exit 1
diff --git a/tests/_self-adaptive/test_context_partial.sh b/tests/_self-adaptive/test_context_partial.sh
index 2d2e49a..d956526 100644
--- a/tests/_self-adaptive/test_context_partial.sh
+++ b/tests/_self-adaptive/test_context_partial.sh
@@ -14,7 +14,7 @@ $MRT_MARIAN/build/marian-adaptive \
   -t ubuntu.contextpart.src ubuntu.contextpart.ref --log contextpart.log < ubuntu.src > contextpart.out
 
 # Check outputs
-diff contextpart.out contextpart.expected > contextpart.diff
+$MRT_TOOLS/diff.sh contextpart.out contextpart.expected > contextpart.diff
 
 # Check costs
 cat contextpart.log | $MRT_TOOLS/extract-costs.sh > contextpart.costs.out
diff --git a/tests/_self-adaptive/test_oracle_1_sent_2_epochs.sh b/tests/_self-adaptive/test_oracle_1_sent_2_epochs.sh
index f307ba7..568104e 100644
--- a/tests/_self-adaptive/test_oracle_1_sent_2_epochs.sh
+++ b/tests/_self-adaptive/test_oracle_1_sent_2_epochs.sh
@@ -20,11 +20,11 @@ $MRT_MARIAN/build/marian-adaptive \
   -t ubuntu.oracle_1s2e.src ubuntu.oracle_1s2e.ref --log oracle_1s2e.log < ubuntu.src > oracle_1s2e.out
 
 # Check outputs
-diff oracle_1s2e.out oracle.expected > oracle_1s2e.diff
+$MRT_TOOLS/diff.sh oracle_1s2e.out oracle.expected > oracle_1s2e.diff
 
 # Check BLEU
 $MRT_TOOLS/moses-scripts/scripts/generic/multi-bleu.perl -lc ubuntu.ref < oracle_1s2e.out > oracle_1s2e.bleu
-diff oracle_1s2e.bleu oracle.bleu.expected > oracle_1s2e.bleu.diff
+$MRT_TOOLS/diff.sh oracle_1s2e.bleu oracle.bleu.expected > oracle_1s2e.bleu.diff
 
 # Check costs
 cat oracle_1s2e.log | grep 'Ep\. ' | $MRT_TOOLS/extract-costs.sh > costs_1s2e.out
diff --git a/tests/_self-adaptive/test_oracle_2_sent_1_epoch.sh b/tests/_self-adaptive/test_oracle_2_sent_1_epoch.sh
index 27d816b..6547a61 100644
--- a/tests/_self-adaptive/test_oracle_2_sent_1_epoch.sh
+++ b/tests/_self-adaptive/test_oracle_2_sent_1_epoch.sh
@@ -20,11 +20,11 @@ $MRT_MARIAN/build/marian-adaptive \
   -t ubuntu.oracle_2s1e.src ubuntu.oracle_2s1e.ref --log oracle_2s1e.log < ubuntu.src > oracle_2s1e.out
 
 # Check outputs
-diff oracle_2s1e.out oracle.expected > oracle_2s1e.diff
+$MRT_TOOLS/diff.sh oracle_2s1e.out oracle.expected > oracle_2s1e.diff
 
 # Check BLEU
 $MRT_TOOLS/moses-scripts/scripts/generic/multi-bleu.perl -lc ubuntu.ref < oracle_2s1e.out > oracle_2s1e.bleu
-diff oracle_2s1e.bleu oracle.bleu.expected > oracle_2s1e.bleu.diff
+$MRT_TOOLS/diff.sh oracle_2s1e.bleu oracle.bleu.expected > oracle_2s1e.bleu.diff
 
 # Check costs
 cat oracle_2s1e.log | grep 'Ep\. ' | $MRT_TOOLS/extract-costs.sh > costs_2s1e.out
diff --git a/tests/_template/test_decoder.sh b/tests/_template/test_decoder.sh
index 1645cc9..bc0e200 100644
--- a/tests/_template/test_decoder.sh
+++ b/tests/_template/test_decoder.sh
@@ -15,7 +15,7 @@ rm -f decoder.{out,diff}
 $MRT_MARIAN/build/marian-decoder -c $MRT_MODELS/wmt16_systems/marian.en-de.yml < text.in > decoder.out
 
 # Compare the output with the expected output
-diff decoder.out text.expected > decoder.diff
+$MRT_TOOLS/diff.sh decoder.out text.expected > decoder.diff
 
 # Exit with success code
 exit 0
diff --git a/tests/_template/test_server.sh b/tests/_template/test_server.sh
index 6d02815..1714d85 100644
--- a/tests/_template/test_server.sh
+++ b/tests/_template/test_server.sh
@@ -30,7 +30,7 @@ python3 $MRT_MARIAN/scripts/server/client_example.py -p 8765 < text.in > server.
 kill $SERVER_PID
 
 # Compare the current output with the expected output
-diff server.out text.expected > server.diff
+$MRT_TOOLS/diff.sh server.out text.expected > server.diff
 
 # Exit with success code
 exit 0
diff --git a/tests/decoder/wmt16/test_ende.sh b/tests/decoder/wmt16/test_ende.sh
index 22707bc..04b5f5b 100644
--- a/tests/decoder/wmt16/test_ende.sh
+++ b/tests/decoder/wmt16/test_ende.sh
@@ -5,7 +5,7 @@ set -e
 
 # Test code goes here
 $MRT_MARIAN/build/marian-decoder -c $MRT_MODELS/wmt16_systems/marian.en-de.yml < text.in > text.out
-diff text.out text.expected > text.diff
+$MRT_TOOLS/diff.sh text.out text.expected > text.diff
 
 # Exit with success code
 exit 0
diff --git a/tests/decoder/wmt16/test_ende_cpu.sh b/tests/decoder/wmt16/test_ende_cpu.sh
index c04ceee..f183315 100644
--- a/tests/decoder/wmt16/test_ende_cpu.sh
+++ b/tests/decoder/wmt16/test_ende_cpu.sh
@@ -11,7 +11,7 @@ fi
 
 # Test code goes here
 $MRT_MARIAN/build/marian-decoder -c $MRT_MODELS/wmt16_systems/marian.en-de.yml --cpu-threads 4 < text.in > text_cpu.out
-diff text_cpu.out text.expected > text_cpu.diff
+$MRT_TOOLS/diff.sh text_cpu.out text.expected > text_cpu.diff
 
 # Exit with success code
 exit 0
diff --git a/tests/decoder/wmt16/test_ende_logs.sh b/tests/decoder/wmt16/test_ende_logs.sh
index 13e5689..55b6542 100644
--- a/tests/decoder/wmt16/test_ende_logs.sh
+++ b/tests/decoder/wmt16/test_ende_logs.sh
@@ -6,7 +6,7 @@ set -e
 # Test code goes here
 $MRT_MARIAN/build/marian-decoder -c $MRT_MODELS/wmt16_systems/marian.en-de.yml < text.in 2> logs.raw
 cat logs.raw | grep "] Best translation" | sed -r "s/.*Best translation [0-9]+ : (.*)/\1/" > logs.out
-diff logs.out text.expected > logs.diff
+$MRT_TOOLS/diff.sh logs.out text.expected > logs.diff
 
 # Exit with success code
 exit 0
diff --git a/tests/decoder/wmt17/test_ende.sh b/tests/decoder/wmt17/test_ende.sh
index d9d61c2..902b16e 100644
--- a/tests/decoder/wmt17/test_ende.sh
+++ b/tests/decoder/wmt17/test_ende.sh
@@ -5,7 +5,7 @@ set -e
 
 # Test code goes here
 $MRT_MARIAN/build/marian-decoder -c $MRT_MODELS/wmt17_systems/marian.en-de.yml < text.in | tail -n 99 > text.out
-diff text.out text.expected > text.diff
+$MRT_TOOLS/diff.sh text.out text.expected > text.diff
 
 # Exit with success code
 exit 0
diff --git a/tests/interface/config/test_load_config.sh b/tests/interface/config/test_load_config.sh
index ff97b07..8947347 100644
--- a/tests/interface/config/test_load_config.sh
+++ b/tests/interface/config/test_load_config.sh
@@ -33,7 +33,7 @@ grep -q "dim-emb: 16" load_config.log
 cat no_config.log   | grep -vP "\[(memory|marian)\]" | $MRT_TOOLS/strip-timestamps.sh > no_config.out
 cat load_config.log | grep -vP "\[(memory|marian)\]" | $MRT_TOOLS/strip-timestamps.sh > load_config.out
 
-diff load_config.out no_config.out > load_config.diff
+$MRT_TOOLS/diff.sh load_config.out no_config.out > load_config.diff
 
 # Exit with success code
 exit 0
diff --git a/tests/interface/envvars/test_interpolate_envvars.sh b/tests/interface/envvars/test_interpolate_envvars.sh
index 472c26d..3dfd5dd 100644
--- a/tests/interface/envvars/test_interpolate_envvars.sh
+++ b/tests/interface/envvars/test_interpolate_envvars.sh
@@ -8,7 +8,7 @@ rm -f envvars.out
 
 export MRTMODELDIR=wmt16_systems
 $MRT_MARIAN/build/marian-decoder -c $MRT_MODELS/'${MRTMODELDIR}'/marian.en-de.yml --interpolate-env-vars -i text.in > envvars.out
-diff envvars.out text.expected > envvars.diff
+$MRT_TOOLS/diff.sh envvars.out text.expected > envvars.diff
 
 # Without --interpolate-env-vars this should fail
 $MRT_MARIAN/build/marian-decoder -c $MRT_MODELS/'${MRTMODELDIR}'/marian.en-de.yml -i text.in > envvars.log 2>&1 || true
diff --git a/tests/models/_char-s2s/test_char_s2s.sh b/tests/models/_char-s2s/test_char_s2s.sh
index 11dbf76..4d9cd62 100644
--- a/tests/models/_char-s2s/test_char_s2s.sh
+++ b/tests/models/_char-s2s/test_char_s2s.sh
@@ -10,7 +10,7 @@ fi
 
 # Test code goes here
 $MRT_MARIAN/build/marian-decoder -c $MRT_MODELS/char-s2s/translate.yml < text.in > text.out
-diff text.out text.expected > text.diff
+$MRT_TOOLS/diff.sh text.out text.expected > text.diff
 
 # Exit with success code
 exit 0
diff --git a/tests/models/transformer/test_hard_aligns.sh b/tests/models/transformer/test_hard_aligns.sh
index 6f5d82b..471d1e7 100644
--- a/tests/models/transformer/test_hard_aligns.sh
+++ b/tests/models/transformer/test_hard_aligns.sh
@@ -8,7 +8,7 @@ rm -f hardalign.out
 # Run Marian
 $MRT_MARIAN/build/marian-decoder -c $MRT_MODELS/transformer/decode.yml -b 6 --mini-batch 32 --alignment < text.in > hardalign.out
 
-diff hardalign.out text.b6.hardalign.expected > hardalign.diff
+$MRT_TOOLS/diff.sh hardalign.out text.b6.hardalign.expected > hardalign.diff
 
 # Exit with success code
 exit 0
diff --git a/tests/models/transformer/test_translation.sh b/tests/models/transformer/test_translation.sh
index 227361e..2ad73e3 100644
--- a/tests/models/transformer/test_translation.sh
+++ b/tests/models/transformer/test_translation.sh
@@ -8,7 +8,7 @@ rm -f transformer.out
 # Run Marian
 $MRT_MARIAN/build/marian-decoder -c $MRT_MODELS/transformer/decode.yml -b 6 < text.in > transformer.out
 
-diff transformer.out text.b6.expected > transformer.diff
+$MRT_TOOLS/diff.sh transformer.out text.b6.expected > transformer.diff
 
 # Exit with success code
 exit 0
diff --git a/tests/models/transformer/test_translation_batched.sh b/tests/models/transformer/test_translation_batched.sh
index 0a428f8..1da9fda 100644
--- a/tests/models/transformer/test_translation_batched.sh
+++ b/tests/models/transformer/test_translation_batched.sh
@@ -8,7 +8,7 @@ rm -f batched.out
 # Run Marian
 $MRT_MARIAN/build/marian-decoder -c $MRT_MODELS/transformer/decode.yml -b 6 --mini-batch 32 < text.in > batched.out
 
-diff batched.out text.b6.expected > batched.diff
+$MRT_TOOLS/diff.sh batched.out text.b6.expected > batched.diff
 
 # Exit with success code
 exit 0
diff --git a/tests/models/wmt16-ende/test_translation_b6n.sh b/tests/models/wmt16-ende/test_translation_b6n.sh
index c013c34..e712a29 100644
--- a/tests/models/wmt16-ende/test_translation_b6n.sh
+++ b/tests/models/wmt16-ende/test_translation_b6n.sh
@@ -7,8 +7,8 @@ set -e
 $MRT_MARIAN/build/marian-decoder -c $MRT_MODELS/wmt16_systems/marian.en-de.yml -b 6 -n 1.0 < text.b6n.in > marian.b6n.out
 
 # Compare with Marian and Nematus
-diff marian.b6n.out marian.b6n.expected > marian.b6n.diff
-diff marian.b6n.out nematus.b6n.out > nematus.b6n.diff
+$MRT_TOOLS/diff.sh marian.b6n.out marian.b6n.expected > marian.b6n.diff
+$MRT_TOOLS/diff.sh marian.b6n.out nematus.b6n.out > nematus.b6n.diff
 
 # Exit with success code
 exit 0
diff --git a/tests/models/wmt16-ende/test_translation_b6n_batch32.sh b/tests/models/wmt16-ende/test_translation_b6n_batch32.sh
index 98ad724..831b845 100644
--- a/tests/models/wmt16-ende/test_translation_b6n_batch32.sh
+++ b/tests/models/wmt16-ende/test_translation_b6n_batch32.sh
@@ -9,8 +9,8 @@ $MRT_MARIAN/build/marian-decoder -c $MRT_MODELS/wmt16_systems/marian.en-de.yml -
     < text.b6n.in > marian.batch32.out
 
 # Compare with Marian and Nematus
-diff marian.batch32.out marian.b6n.expected > marian.batch32.diff
-diff marian.batch32.out nematus.b6n.out > nematus.batch32.diff
+$MRT_TOOLS/diff.sh marian.batch32.out marian.b6n.expected > marian.batch32.diff
+$MRT_TOOLS/diff.sh marian.batch32.out nematus.b6n.out > nematus.batch32.diff
 
 # Exit with success code
 exit 0
diff --git a/tests/models/wmt16-ende/test_translation_b6n_batch64.sh b/tests/models/wmt16-ende/test_translation_b6n_batch64.sh
index 9f33abf..76ebea0 100644
--- a/tests/models/wmt16-ende/test_translation_b6n_batch64.sh
+++ b/tests/models/wmt16-ende/test_translation_b6n_batch64.sh
@@ -9,8 +9,8 @@ $MRT_MARIAN/build/marian-decoder -c $MRT_MODELS/wmt16_systems/marian.en-de.yml -
     < text.b6n.in > marian.batch64.out
 
 # Compare with Marian and Nematus
-diff marian.batch64.out marian.b6n.expected > marian.batch64.diff
-diff marian.batch64.out nematus.b6n.out > nematus.batch64.diff
+$MRT_TOOLS/diff.sh marian.batch64.out marian.b6n.expected > marian.batch64.diff
+$MRT_TOOLS/diff.sh marian.batch64.out nematus.b6n.out > nematus.batch64.diff
 
 # Exit with success code
 exit 0
diff --git a/tests/models/wmt17-ende/test_translation_b6n.sh b/tests/models/wmt17-ende/test_translation_b6n.sh
index 91620ca..07ec8e6 100644
--- a/tests/models/wmt17-ende/test_translation_b6n.sh
+++ b/tests/models/wmt17-ende/test_translation_b6n.sh
@@ -9,8 +9,8 @@ rm -f marian.b6n.out
 $MRT_MARIAN/build/marian-decoder -c $MRT_MODELS/wmt17_systems/marian.en-de.yml -b 6 -n 1.0 < text.b6n.in > marian.b6n.out
 
 # Compare with Marian and Nematus
-diff marian.b6n.out marian.b6n.expected > marian.b6n.diff
-diff marian.b6n.out nematus.b6n.out > nematus.b6n.diff
+$MRT_TOOLS/diff.sh marian.b6n.out marian.b6n.expected > marian.b6n.diff
+$MRT_TOOLS/diff.sh marian.b6n.out nematus.b6n.out > nematus.b6n.diff
 
 # Exit with success code
 exit 0
diff --git a/tests/models/wmt17-ende/test_translation_b6n_batch32.sh b/tests/models/wmt17-ende/test_translation_b6n_batch32.sh
index 934e42c..49ae6af 100644
--- a/tests/models/wmt17-ende/test_translation_b6n_batch32.sh
+++ b/tests/models/wmt17-ende/test_translation_b6n_batch32.sh
@@ -12,8 +12,8 @@ $MRT_MARIAN/build/marian-decoder -c $MRT_MODELS/wmt17_systems/marian.en-de.yml -
     < text.b6n.in > marian.batch32.out
 
 # Compare with Marian and Nematus
-diff marian.batch32.out marian.b6n.expected > marian.batch32.diff
-diff marian.batch32.out nematus.b6n.out > nematus.batch32.diff
+$MRT_TOOLS/diff.sh marian.batch32.out marian.b6n.expected > marian.batch32.diff
+$MRT_TOOLS/diff.sh marian.batch32.out nematus.b6n.out > nematus.batch32.diff
 
 # Exit with success code
 exit 0
diff --git a/tests/models/wnmt18/test_student_small.sh b/tests/models/wnmt18/test_student_small.sh
index a09986a..74724f9 100644
--- a/tests/models/wnmt18/test_student_small.sh
+++ b/tests/models/wnmt18/test_student_small.sh
@@ -18,7 +18,7 @@ cat newstest2014.in | $MRT_MARIAN/build/marian-decoder \
     --shortlist $MRT_MODELS/wnmt18/lex.s2t 100 75 --cpu-threads=1 --skip-cost --max-length-factor 1.2 \
     > student_small.out
 
-diff student_small.out student_small.expected > student_small.diff
+$MRT_TOOLS/diff.sh student_small.out student_small.expected > student_small.diff
 
 # Exit with success code
 exit 0
diff --git a/tests/models/wnmt18/test_student_small_aan.sh b/tests/models/wnmt18/test_student_small_aan.sh
index cfa53f1..73f3fd7 100644
--- a/tests/models/wnmt18/test_student_small_aan.sh
+++ b/tests/models/wnmt18/test_student_small_aan.sh
@@ -18,7 +18,7 @@ cat newstest2014.in | $MRT_MARIAN/build/marian-decoder \
     --shortlist $MRT_MODELS/wnmt18/lex.s2t 100 75 --cpu-threads=1 --skip-cost --max-length-factor 1.2 \
     > student_small_aan.out
 
-diff student_small_aan.out student_small_aan.expected > student_small_aan.diff
+$MRT_TOOLS/diff.sh student_small_aan.out student_small_aan.expected > student_small_aan.diff
 
 # Exit with success code
 exit 0
diff --git a/tests/scorer/align/test_scorer_align.sh b/tests/scorer/align/test_scorer_align.sh
index 6a3a788..68fe68e 100644
--- a/tests/scorer/align/test_scorer_align.sh
+++ b/tests/scorer/align/test_scorer_align.sh
@@ -9,7 +9,7 @@ $MRT_MARIAN/build/marian-scorer -c $MRT_MODELS/wmt16_systems/marian.en-de.scorer
   | sed 's/^.* ||| //' > align.out
 
 # Compare scores
-diff align.out align.expected > align.diff
+$MRT_TOOLS/diff.sh align.out align.expected > align.diff
 
 # Exit with success code
 exit 0
diff --git a/tests/scorer/align/test_scorer_align_batch_1.sh b/tests/scorer/align/test_scorer_align_batch_1.sh
index 4d0069f..d81374b 100644
--- a/tests/scorer/align/test_scorer_align_batch_1.sh
+++ b/tests/scorer/align/test_scorer_align_batch_1.sh
@@ -9,7 +9,7 @@ $MRT_MARIAN/build/marian-scorer -c $MRT_MODELS/wmt16_systems/marian.en-de.scorer
   | sed 's/^.* ||| //' > align.b1.out
 
 # Compare scores
-diff align.b1.out align.expected > align.b1.diff
+$MRT_TOOLS/diff.sh align.b1.out align.expected > align.b1.diff
 
 # Exit with success code
 exit 0
diff --git a/tests/scorer/scores/test_compare_with_decoder_scores.sh b/tests/scorer/scores/test_compare_with_decoder_scores.sh
index e80b45f..e4a7440 100644
--- a/tests/scorer/scores/test_compare_with_decoder_scores.sh
+++ b/tests/scorer/scores/test_compare_with_decoder_scores.sh
@@ -9,7 +9,7 @@ $MRT_MARIAN/build/marian-decoder -c $MRT_MODELS/wmt16_systems/marian.en-de.yml \
 
 # Compare translations
 cat nbest.out | sed 's/ ||| /\t/g' | cut -f2 > text.out
-diff text.out text.expected > text.diff
+$MRT_TOOLS/diff.sh text.out text.expected > text.diff
 
 # Prepare source and target files for rescoring
 cat text.in | perl -ne 'for$i(1..12){print}' > compare.src
diff --git a/tests/server/test_ende.sh b/tests/server/test_ende.sh
index df703cf..a309d31 100644
--- a/tests/server/test_ende.sh
+++ b/tests/server/test_ende.sh
@@ -17,7 +17,7 @@ sleep 20
 python3 $MRT_MARIAN/scripts/server/client_example.py -p 8765 < text.in > text.out
 kill $SERVER_PID
 
-diff text.out text.expected > text.diff
+$MRT_TOOLS/diff.sh text.out text.expected > text.diff
 test -e server.log
 grep -q "listening on port 8765" server.log
 
diff --git a/tests/server/test_ende_align.sh b/tests/server/test_ende_align.sh
index ac696cc..5242d7b 100644
--- a/tests/server/test_ende_align.sh
+++ b/tests/server/test_ende_align.sh
@@ -18,7 +18,7 @@ sleep 20
 python3 $MRT_MARIAN/scripts/server/client_example.py -p 8765 < text.in > text.align.out
 kill $SERVER_PID
 
-diff text.align.out text.align.expected > text.align.diff
+$MRT_TOOLS/diff.sh text.align.out text.align.expected > text.align.diff
 
 # Exit with success code
 exit 0
diff --git a/tests/server/test_ende_batch32.sh b/tests/server/test_ende_batch32.sh
index a36a55e..c9955e6 100644
--- a/tests/server/test_ende_batch32.sh
+++ b/tests/server/test_ende_batch32.sh
@@ -17,7 +17,7 @@ sleep 20
 
 python3 $MRT_MARIAN/scripts/server/client_example.py -p 8766 -b 32 < text.in > text.b32.out
 kill $SERVER_PID
-diff text.b32.out text.expected > text.diff
+$MRT_TOOLS/diff.sh text.b32.out text.expected > text.diff
 
 # Exit with success code
 exit 0
diff --git a/tests/server/test_ende_cpu.sh b/tests/server/test_ende_cpu.sh
index c5305a4..8925561 100644
--- a/tests/server/test_ende_cpu.sh
+++ b/tests/server/test_ende_cpu.sh
@@ -25,7 +25,7 @@ sleep 20
 python3 $MRT_MARIAN/scripts/server/client_example.py -p 8768 < text4.in > text4.cpu.out
 kill $SERVER_PID
 
-diff text4.cpu.out text4.expected > text4.cpu.diff
+$MRT_TOOLS/diff.sh text4.cpu.out text4.expected > text4.cpu.diff
 test -e server_cpu.log
 grep -q "listening on port 8768" server_cpu.log
 
diff --git a/tests/training/basics/test_mini_batch_fit.sh b/tests/training/basics/test_mini_batch_fit.sh
index 7d54d94..2f1ba77 100644
--- a/tests/training/basics/test_mini_batch_fit.sh
+++ b/tests/training/basics/test_mini_batch_fit.sh
@@ -24,7 +24,7 @@ test -e batch_fit/model.npz.amun.yml
 test -e batch_fit.log
 
 cat batch_fit.log | grep 'Ep\. 1 :' | sed -r 's/.*Up\. ([0-9]+) .*Sen. ([0-9]+).*/\2\/\1/' | bc > batch_fit.out
-diff batch_fit.out batch_fit.expected > batch_fit.diff
+$MRT_TOOLS/diff.sh batch_fit.out batch_fit.expected > batch_fit.diff
 
 # Exit with success code
 exit 0
diff --git a/tests/training/mixed-models/test_ensemble_of_different_s2s.sh b/tests/training/mixed-models/test_ensemble_of_different_s2s.sh
index d26319d..4fb5a4d 100644
--- a/tests/training/mixed-models/test_ensemble_of_different_s2s.sh
+++ b/tests/training/mixed-models/test_ensemble_of_different_s2s.sh
@@ -31,7 +31,7 @@ test -e two_s2s_B.log
 $MRT_MARIAN/build/marian-decoder -m two_s2s/modelA.npz two_s2s/modelB.npz -v vocab.en.yml vocab.de.yml \
     -i text.in -o two_s2s.out --log two_s2s.log
 
-diff two_s2s.out two_s2s.expected > two_s2s.diff
+$MRT_TOOLS/diff.sh two_s2s.out two_s2s.expected > two_s2s.diff
 
 # Exit with success code
 exit 0
diff --git a/tests/training/mixed-models/test_ensemble_of_s2s_and_transformer.sh b/tests/training/mixed-models/test_ensemble_of_s2s_and_transformer.sh
index 2580c26..2b0142e 100644
--- a/tests/training/mixed-models/test_ensemble_of_s2s_and_transformer.sh
+++ b/tests/training/mixed-models/test_ensemble_of_s2s_and_transformer.sh
@@ -31,7 +31,7 @@ test -e s2s_transf_B.log
 $MRT_MARIAN/build/marian-decoder -m s2s_transf/modelA.npz s2s_transf/modelB.npz -v vocab.en.yml vocab.de.yml \
     -i text.in -o s2s_transf.out --log s2s_transf.log
 
-diff s2s_transf.out s2s_transf.expected > s2s_transf.diff
+$MRT_TOOLS/diff.sh s2s_transf.out s2s_transf.expected > s2s_transf.diff
 
 # Exit with success code
 exit 0
diff --git a/tests/training/restoring/optimizer/test_adagrad_params.sh b/tests/training/restoring/optimizer/test_adagrad_params.sh
index 49fa78a..dabe9bd 100644
--- a/tests/training/restoring/optimizer/test_adagrad_params.sh
+++ b/tests/training/restoring/optimizer/test_adagrad_params.sh
@@ -21,7 +21,7 @@ $MRT_TOOLS/extract-costs.sh < adagrad.log > adagrad.costs.out
 $MRT_TOOLS/diff-nums.py adagrad.costs.out adagrad.costs.expected -p 0.2 -o adagrad.costs.diff
 
 python $MRT_MARIAN/scripts/contrib/model_info.py -m adagrad/model.npz.optimizer.npz > adagrad.keys.out
-diff adagrad.keys.out adagrad.keys.expected > adagrad.keys.diff
+$MRT_TOOLS/diff.sh adagrad.keys.out adagrad.keys.expected > adagrad.keys.diff
 
 python $MRT_MARIAN/scripts/contrib/model_info.py -m adagrad/model.npz.optimizer.npz -k "adagrad_gt" > adagrad.gt.out
 $MRT_TOOLS/diff-nums.py --numpy -p 0.0001 adagrad.gt.out adagrad.gt.expected -o adagrad.gt.diff
diff --git a/tests/training/restoring/optimizer/test_adam_params.sh b/tests/training/restoring/optimizer/test_adam_params.sh
index c1522d3..7c08df1 100644
--- a/tests/training/restoring/optimizer/test_adam_params.sh
+++ b/tests/training/restoring/optimizer/test_adam_params.sh
@@ -21,7 +21,7 @@ $MRT_TOOLS/extract-costs.sh < adam.log > adam.costs.out
 $MRT_TOOLS/diff-nums.py adam.costs.out adam.costs.expected -p 0.2 -o adam.costs.diff
 
 python $MRT_MARIAN/scripts/contrib/model_info.py -m adam/model.npz.optimizer.npz > adam.keys.out
-diff adam.keys.out adam.keys.expected > adam.keys.diff
+$MRT_TOOLS/diff.sh adam.keys.out adam.keys.expected > adam.keys.diff
 
 python $MRT_MARIAN/scripts/contrib/model_info.py -m adam/model.npz.optimizer.npz -k "adam_mt" > adam.mt.out
 $MRT_TOOLS/diff-nums.py --numpy -p 0.0001  adam.mt.out adam.mt.expected -o adam.mt.diff
diff --git a/tests/training/restoring/optimizer/test_adam_params_async.sh b/tests/training/restoring/optimizer/test_adam_params_async.sh
index c9b1271..211c135 100644
--- a/tests/training/restoring/optimizer/test_adam_params_async.sh
+++ b/tests/training/restoring/optimizer/test_adam_params_async.sh
@@ -26,7 +26,7 @@ $MRT_TOOLS/extract-costs.sh < adam_async.log > adam_async.costs.out
 $MRT_TOOLS/diff-nums.py adam_async.costs.out adam_async.costs.expected -p 10.00 -n 2 -o adam_async.costs.diff
 
 python $MRT_MARIAN/scripts/contrib/model_info.py -m adam_async/model.npz.optimizer.npz > adam_async.keys.out
-diff adam_async.keys.out adam.keys.expected > adam_async.keys.diff
+$MRT_TOOLS/diff.sh adam_async.keys.out adam.keys.expected > adam_async.keys.diff
 
 python $MRT_MARIAN/scripts/contrib/model_info.py -m adam_async/model.npz.optimizer.npz -k "adam_mt" > adam_async.mt.out
 python $MRT_MARIAN/scripts/contrib/model_info.py -m adam_async/model.npz.optimizer.npz -k "adam_vt" > adam_async.vt.out
diff --git a/tests/training/restoring/optimizer/test_adam_params_sync.sh b/tests/training/restoring/optimizer/test_adam_params_sync.sh
index 56e231c..e287bff 100644
--- a/tests/training/restoring/optimizer/test_adam_params_sync.sh
+++ b/tests/training/restoring/optimizer/test_adam_params_sync.sh
@@ -26,7 +26,7 @@ $MRT_TOOLS/extract-costs.sh < adam_sync.log > adam_sync.costs.out
 $MRT_TOOLS/diff-nums.py adam_sync.costs.out adam_sync.costs.expected -p 3.00 -n 2 -o adam_sync.costs.diff
 
 python $MRT_MARIAN/scripts/contrib/model_info.py -m adam_sync/model.npz.optimizer.npz > adam_sync.keys.out
-diff adam_sync.keys.out adam.keys.expected > adam_sync.keys.diff
+$MRT_TOOLS/diff.sh adam_sync.keys.out adam.keys.expected > adam_sync.keys.diff
 
 python $MRT_MARIAN/scripts/contrib/model_info.py -m adam_sync/model.npz.optimizer.npz -k "adam_mt" > adam_sync.mt.out
 python $MRT_MARIAN/scripts/contrib/model_info.py -m adam_sync/model.npz.optimizer.npz -k "adam_vt" > adam_sync.vt.out
diff --git a/tests/training/restoring/validation/test_restoring_newbest_validators.sh b/tests/training/restoring/validation/test_restoring_newbest_validators.sh
index 296cea8..8674944 100644
--- a/tests/training/restoring/validation/test_restoring_newbest_validators.sh
+++ b/tests/training/restoring/validation/test_restoring_newbest_validators.sh
@@ -53,7 +53,7 @@ test -e valid_newbest/model.npz
 test -e valid_newbest_2.log
 
 cat valid_newbest_2.log | $MRT_TOOLS/strip-timestamps.sh | grep -P "\[valid\]" >> valid_newbest.out
-diff valid_newbest.out valid_newbest.expected > valid_newbest.diff
+$MRT_TOOLS/diff.sh valid_newbest.out valid_newbest.expected > valid_newbest.diff
 
 # Exit with success code
 exit 0
diff --git a/tests/training/restoring/validation/test_restoring_stalled_validators.sh b/tests/training/restoring/validation/test_restoring_stalled_validators.sh
index 8283e26..a53e323 100644
--- a/tests/training/restoring/validation/test_restoring_stalled_validators.sh
+++ b/tests/training/restoring/validation/test_restoring_stalled_validators.sh
@@ -68,7 +68,7 @@ test -e valid_stalled_2.log
 
 cat valid_stalled_2.log | $MRT_TOOLS/strip-timestamps.sh \
     | grep -P "\[valid\]|Saving model" | grep -v "cross-entropy" >> valid_stalled.out
-diff valid_stalled.out valid_stalled.expected > valid_stalled.diff
+$MRT_TOOLS/diff.sh valid_stalled.out valid_stalled.expected > valid_stalled.diff
 
 # Exit with success code
 exit 0
diff --git a/tests/training/restoring/validation/test_restoring_validation.sh b/tests/training/restoring/validation/test_restoring_validation.sh
index 1a1785a..3a1786b 100644
--- a/tests/training/restoring/validation/test_restoring_validation.sh
+++ b/tests/training/restoring/validation/test_restoring_validation.sh
@@ -36,7 +36,7 @@ test -e valid/model.npz
 test -e valid_2.log
 
 cat valid_2.log | $MRT_TOOLS/strip-timestamps.sh | grep "valid-script" >> valid.out
-diff valid.out valid.expected > valid.diff
+$MRT_TOOLS/diff.sh valid.out valid.expected > valid.diff
 
 # Exit with success code
 exit 0