From 31913a8524edf97ad79f9f895d6ac5761b9b2fd7 Mon Sep 17 00:00:00 2001 From: Ori Bernstein Date: Sun, 19 Feb 2023 20:44:56 -0500 Subject: mkfiles: add 'mk test' support 9front has several tests scattered throughout the source, as well as more tests in an external 'regress' repository. Many of these tests are broken, because there is no easy way to build and track all of them. This pulls in several tests from different sources, deletes the broken tests, tests with missing data, and adds a single command that can be run from the root of the src directory to test our system. The hope is that as we develop new code, we add more tests, and eventually start running the tests on every commit. Please enter the commit message for your changes. Lines starting --- sys/lib/git/common.rc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'sys/lib') diff --git a/sys/lib/git/common.rc b/sys/lib/git/common.rc index dd434265a..63a2e1602 100644 --- a/sys/lib/git/common.rc +++ b/sys/lib/git/common.rc @@ -84,10 +84,11 @@ fn merge1 {@{ base=/dev/null if(! test -f $theirs) theirs=/dev/null - if(! ape/diff3 -3 -m $ours $base $theirs > $tmp) - echo merge needed: $out >[1=2] if(mergeperm $ours $base $theirs){ + mkdir -p `{basename -d $tmp} + if(! ape/diff3 -3 -m $ours $base $theirs > $tmp) + echo merge needed: $out >[1=2] mv $tmp $out git/add $out chmod $mergedperms $out -- cgit v1.2.3