From 551c334cdd7a2cf480007746367a5cdd5c81fc87 Mon Sep 17 00:00:00 2001 From: Pierre Dubouilh Date: Sun, 19 Jan 2020 14:45:43 +0100 Subject: [PATCH] try shorten ci --- Makefile | 9 +++------ gossa-ui | 2 +- src/gossa_test.go | 4 +--- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index dcab646..063183e 100755 --- a/Makefile +++ b/Makefile @@ -6,15 +6,12 @@ build: rm gossa.go run: - make build ./gossa -verb=true test-fixture run-ro: - make build ./gossa -verb=true -ro=true test-fixture run-extra: - make build ./gossa -verb=true -prefix="/fancy-path/" -k=false -symlinks=true test-fixture test: @@ -25,13 +22,13 @@ test: go test watch: - ls src/* gossa-ui/* | entr -rc make run + ls src/* gossa-ui/* | entr -rc make build run watch-extra: - ls src/* gossa-ui/* | entr -rc make run-extra + ls src/* gossa-ui/* | entr -rc make build run-extra watch-ro: - ls src/* gossa-ui/* | entr -rc make run-ro + ls src/* gossa-ui/* | entr -rc make build run-ro watch-test: ls src/* gossa-ui/* | entr -rc make test diff --git a/gossa-ui b/gossa-ui index 597b499..e2a235d 160000 --- a/gossa-ui +++ b/gossa-ui @@ -1 +1 @@ -Subproject commit 597b49973f8f855f74a3c12b2be769031098def8 +Subproject commit e2a235d2bf06abafab536bc11120ac54401a3331 diff --git a/src/gossa_test.go b/src/gossa_test.go index 066614e..d3e8e0b 100644 --- a/src/gossa_test.go +++ b/src/gossa_test.go @@ -302,14 +302,12 @@ func startGossa(what string) int { cmd.Stdout = os.Stdout cmd.Stderr = os.Stdout cmd.Start() - time.Sleep(5 * time.Second) + time.Sleep(3 * time.Second) return cmd.Process.Pid } func killallgossa() { cmd := exec.Command("/usr/bin/killall", "gossa") - cmd.Stdout = os.Stdout - cmd.Stderr = os.Stdout cmd.Start() }