empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Suppress duplicates in output of git ls-files

Browse source 
Happens during merges; can mess up tests badly.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2014-01-18 12:10:50 +01:00
parent 1b7b5b09e3
commit 582ad80d75
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Make.mk
View file

@ -46,7 +46,7 @@ all:
# Source files # Source files
ifeq ($(revctrl),git) ifeq ($(revctrl),git)
src := $(shell cd $(srcdir) && git ls-files) src := $(shell cd $(srcdir) && git ls-files | uniq)
else else
include $(srcdir)/sources.mk include $(srcdir)/sources.mk
endif endif

4
tests/test-common.sh
View file

@ -34,7 +34,7 @@ keep_journal 2
GODNEWS 0 GODNEWS 0
running_test_suite 1 running_test_suite 1
EOF EOF
cp `git ls-files "$srcdir"/src/lib/global | grep '\.config$'` sandbox/share/empire/builtin cp `git ls-files "$srcdir"/src/lib/global | uniq | grep '\.config$'` sandbox/share/empire/builtin
} }
now() now()
@ -119,7 +119,7 @@ feed_files()
feed_dir() feed_dir()
{ {
feed_files `git ls-files "$@" | grep '/[0-9][0-9]-[^/]*$'` feed_files `git ls-files "$@" | uniq | grep '/[0-9][0-9]-[^/]*$'`
} }
begin_test() begin_test()