diff options
Diffstat (limited to 'tools/pci')
| -rw-r--r-- | tools/pci/Makefile | 8 | ||||
| -rw-r--r-- | tools/pci/pcitest.c | 8 |
2 files changed, 11 insertions, 5 deletions
diff --git a/tools/pci/Makefile b/tools/pci/Makefile index 46e4c2f318c9..9b7534457060 100644 --- a/tools/pci/Makefile +++ b/tools/pci/Makefile @@ -14,9 +14,12 @@ MAKEFLAGS += -r CFLAGS += -O2 -Wall -g -D_GNU_SOURCE -I$(OUTPUT)include -ALL_TARGETS := pcitest pcitest.sh +ALL_TARGETS := pcitest ALL_PROGRAMS := $(patsubst %,$(OUTPUT)%,$(ALL_TARGETS)) +SCRIPTS := pcitest.sh +ALL_SCRIPTS := $(patsubst %,$(OUTPUT)%,$(SCRIPTS)) + all: $(ALL_PROGRAMS) export srctree OUTPUT CC LD CFLAGS @@ -46,6 +49,9 @@ install: $(ALL_PROGRAMS) install -d -m 755 $(DESTDIR)$(bindir); \ for program in $(ALL_PROGRAMS); do \ install $$program $(DESTDIR)$(bindir); \ + done; \ + for script in $(ALL_SCRIPTS); do \ + install $$script $(DESTDIR)$(bindir); \ done FORCE: diff --git a/tools/pci/pcitest.c b/tools/pci/pcitest.c index ec4d51f3308b..5fa5c2bdd427 100644 --- a/tools/pci/pcitest.c +++ b/tools/pci/pcitest.c @@ -140,6 +140,7 @@ static void run_test(struct pci_test *test) } fflush(stdout); + return (ret < 0) ? ret : 1 - ret; /* return 0 if test succeeded */ } int main(int argc, char **argv) @@ -162,7 +163,7 @@ int main(int argc, char **argv) /* set default endpoint device */ test->device = "/dev/pci-endpoint-test.0"; - while ((c = getopt(argc, argv, "D:b:m:x:i:Ilrwcs:")) != EOF) + while ((c = getopt(argc, argv, "D:b:m:x:i:Ilhrwcs:")) != EOF) switch (c) { case 'D': test->device = optarg; @@ -206,7 +207,6 @@ int main(int argc, char **argv) case 's': test->size = strtoul(optarg, NULL, 0); continue; - case '?': case 'h': default: usage: @@ -224,10 +224,10 @@ usage: "\t-w Write buffer test\n" "\t-c Copy buffer test\n" "\t-s <size> Size of buffer {default: 100KB}\n", + "\t-h Print this help message\n", argv[0]); return -EINVAL; } - run_test(test); - return 0; + return run_test(test); } |