Dummy check for merge conflict testing

Signed-off-by: Bence Szépkúti <bence.szepkuti@arm.com>
Mbed-TLS · Jul 19, 2023 · 9a47863 · 9a47863
1 parent 19280ad
commit 9a47863
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/tests/scripts/all.sh b/tests/scripts/all.sh
@@ -918,6 +918,11 @@ helper_libtestdriver1_make_main() {
 #
 # Indicative running times are given for reference.
 
+component_check_simulated_silent_merge_conflict () {
+    msg "Check: simulated silent merge conflict"
+    [ ! -e merge_conflict.txt ]
+}
+
 component_check_recursion () {
     msg "Check: recursion.pl" # < 1s
     tests/scripts/recursion.pl library/*.c