Skip to content

Commit 4eae236

Browse files
b0wterigrr
authored andcommitted
Replaced handling of trailing cr in diff with an awk skript.
This is still POSIX compliant and works with the busy box implementation of diff.
1 parent 011c110 commit 4eae236

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

Makefile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,9 @@ test: $(TARGET)
127127
./mkspiffs -c spiffs_t $(SPIFFS_TEST_FS_CONFIG) out.spiffs_t | sort | sed s/^\\/// > out.list1
128128
./mkspiffs -u spiffs_u $(SPIFFS_TEST_FS_CONFIG) out.spiffs_t | sort | sed s/^\\/// > out.list_u
129129
./mkspiffs -l $(SPIFFS_TEST_FS_CONFIG) out.spiffs_t | cut -f 2 | sort | sed s/^\\/// > out.list2
130-
diff --strip-trailing-cr out.list0 out.list1
131-
diff --strip-trailing-cr out.list0 out.list2
130+
awk 'BEGIN{RS="\1";ORS="";getline;gsub("\r","");print>ARGV[1]}' out.list0 out.list1 out.list2
131+
diff out.list0 out.list1
132+
diff out.list0 out.list2
132133
rm -rf spiffs_t/.git
133134
rm -f spiffs_t/.DS_Store
134135
diff spiffs_t spiffs_u

0 commit comments

Comments
 (0)