resolve conflict

build.sh

@@ -1,9 +1,5 @@
 #!/bin/sh
 
-echo '```' > docs/testing.md
-cat test_report/* >> docs/testing.md
-echo '```' >> docs/testing.md
-
 git clone https://github.com/embroidermodder/userman
 git clone https://github.com/embroidermodder/refman
 

test.sh

@@ -1,28 +1,54 @@
 #!/bin/sh
 
-mkdir test_report || exit 1
-echo "0" > test_report/result.txt
+RES="`pwd`/docs/testing.md"
 
 function fail_result () {
-    echo "$1" > test_report/result.txt
+    echo "$1" >> $RES
     exit 0
 }
 
-git clone https://github.com/Embroidermodder/embroidermodder || fail_result 1
+echo "## Embroidermodder Download" > $RES
+git clone https://github.com/Embroidermodder/embroidermodder &>> $RES || fail_result 1
 cd embroidermodder || fail_result 2
-bash build.sh --linux &> ../test_report/build_embroidermodder.log || fail_result 3
-bash build.sh -d &> ../test_report/debug_embroidermodder.log || fail_result 4
+
+echo "## Embroidermodder Build" >> $RES
+echo -e '\n```\n' >> $RES
+bash build.sh --linux &>> $RES || fail_result 3
+echo -e '\n```\n' >> $RES
+
+echo "## Embroidermodder Debug" >> $RES
+echo -e '\n```\n' >> $RES
+bash build.sh -d &>> $RES || fail_result 4
+echo -e '\n```\n' >> $RES
+
 cd .. || fail_result 5
 
-git clone https://github.com/Embroidermodder/libembroidery || fail_result 6
+git clone https://github.com/Embroidermodder/libembroidery &>> $RES || fail_result 6
 cd libembroidery || fail_result 7
-bash build.sh -d &> ../test_report/build_libembroidery.log || fail_result 8
+
+echo "## Libembroidery Build" >> $RES
+echo -e '\n```\n' >> $RES
+bash build.sh -d &>> $RES || fail_result 8
+echo -e '\n```\n' >> $RES
+
 cd debug || fail_result 9
-./embroider --test &> ../test_report/test_embroider.log || fail_result 10
+
+echo "## Libembroidery Testing" >> $RES
+echo -e '\n```\n' >> $RES
+./embroider --test &>> $RES || fail_result 10
+echo -e '\n```\n' >> $RES
+
 cd .. || fail_result 11
 cd .. || fail_result 12
 
 git clone https://github.com/Embroidermodder/EmbroideryMobile || fail_result 13
 cd EmbroideryMobile || fail_result 14
-bash build.sh -d &> ../test_report/build_mobile.log || fail_result 15
+
+echo "## " >> $RES
+echo -e '\n```\n' >> $RES
+bash build.sh -d &>> $RES || fail_result 15
+echo -e '\n```\n' >> $RES
+
 cd .. || fail_result 16
+
+echo "0" >> $RES