DeforaOS/configure
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add tests for spaces in filenames (scripts)

Browse Source
This commit is contained in:
Pierre Pronchery 2019-02-12 20:30:49 +01:00
parent 569bed6399
commit c174eb7cb4
3 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/makefile.c
View File

@ -3097,8 +3097,8 @@ static int _makefile_output_variable(Makefile * makefile, String const * name,
static int _makefile_mkdir(Makefile * makefile, char const * directory) static int _makefile_mkdir(Makefile * makefile, char const * directory)
{ {
/* FIXME keep track of the directories created */ /* FIXME keep track of the directories created */
return _makefile_print(makefile, "%s%s\n", "\t$(MKDIR) $(DESTDIR)", return (_makefile_print(makefile, "%s%s\n", "\t$(MKDIR) $(DESTDIR)",
directory); directory) >= 0) ? 0 : -1;
} }

18
tests/script/Makefile.NetBSD
View File

@ -1,4 +1,4 @@
TARGETS = $(OBJDIR)test phony TARGETS = $(OBJDIR)test phony s\ p\ a\ c\ e\ s $(OBJDIR)s\ p\ a\ c\ e\ s\ 2
OBJDIR = OBJDIR =
PREFIX = /usr/local PREFIX = /usr/local
DESTDIR = DESTDIR =
@ -19,11 +19,19 @@ $(OBJDIR)disabled: a.c b.c
phony: a.c b.c phony: a.c b.c
./script.sh -P "$(PREFIX)" -- "phony" ./script.sh -P "$(PREFIX)" -- "phony"
s\ p\ a\ c\ e\ s: $(OBJDIR)s\ p\ a\ c\ e\ s\ 2
./s\ c\ r\ i\ p\ t.sh -P "$(PREFIX)" -- "s p a c e s"
$(OBJDIR)s\ p\ a\ c\ e\ s\ 2:
./s\ c\ r\ i\ p\ t.sh -P "$(PREFIX)" -- "$(OBJDIR)s p a c e s 2"
clean: clean:
$(RM) -- $(test_OBJS) $(disabled_OBJS) $(phony_OBJS) $(RM) --
./script.sh -c -P "/somewhere/else" -- "$(OBJDIR)test" ./script.sh -c -P "/somewhere/else" -- "$(OBJDIR)test"
./script.sh -c -P "$(PREFIX)" -- "$(OBJDIR)disabled" ./script.sh -c -P "$(PREFIX)" -- "$(OBJDIR)disabled"
./script.sh -c -P "$(PREFIX)" -- "phony" ./script.sh -c -P "$(PREFIX)" -- "phony"
./s\ c\ r\ i\ p\ t.sh -c -P "$(PREFIX)" -- "s p a c e s"
./s\ c\ r\ i\ p\ t.sh -c -P "$(PREFIX)" -- "$(OBJDIR)s p a c e s 2"
distclean: clean distclean: clean
$(RM) -- $(TARGETS) $(RM) -- $(TARGETS)
@ -31,9 +39,13 @@ distclean: clean
install: all install: all
./script.sh -P "$(DESTDIR)/somewhere/else/again" -i -- "$(OBJDIR)test" ./script.sh -P "$(DESTDIR)/somewhere/else/again" -i -- "$(OBJDIR)test"
./script.sh -P "$(DESTDIR)$(PREFIX)" -i -- "phony" ./script.sh -P "$(DESTDIR)$(PREFIX)" -i -- "phony"
./s\ c\ r\ i\ p\ t.sh -P "$(DESTDIR)$(PREFIX)" -i -- "s p a c e s"
./s\ c\ r\ i\ p\ t.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)s p a c e s 2"
uninstall: uninstall:
./script.sh -P "$(DESTDIR)/somewhere/else/again" -u -- "test" ./script.sh -P "$(DESTDIR)/somewhere/else/again" -u -- "test"
./script.sh -P "$(DESTDIR)$(PREFIX)" -u -- "phony" ./script.sh -P "$(DESTDIR)$(PREFIX)" -u -- "phony"
./s\ c\ r\ i\ p\ t.sh -P "$(DESTDIR)$(PREFIX)" -u -- "s p a c e s"
./s\ c\ r\ i\ p\ t.sh -P "$(DESTDIR)$(PREFIX)" -u -- "s p a c e s 2"
.PHONY: all clean distclean install uninstall phony .PHONY: all clean distclean install uninstall phony s\ p\ a\ c\ e\ s

14
tests/script/project.conf
View File

@ -1,4 +1,4 @@
targets=test,disabled,phony targets=test,disabled,phony,s p a c e s,s p a c e s 2
dist=Makefile dist=Makefile
[test] [test]
@ -19,3 +19,15 @@ script=./script.sh
depends=a.c,b.c depends=a.c,b.c
phony=1 phony=1
install= install=
[s p a c e s]
type=script
script=./s c r i p t.sh
depends=$(OBJDIR)s p a c e s 2
phony=1
install=
[s p a c e s 2]
type=script
script=./s c r i p t.sh
install=