From 23d0735f906498ca273b7cac399e9c8f0a0f08e8 Mon Sep 17 00:00:00 2001
From: Ethan Koenig <ethantkoenig@gmail.com>
Date: Fri, 9 Jun 2017 22:27:13 -0400
Subject: [PATCH] Absolute path for setting.CustomConf
---
integrations/integration_test.go | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/integrations/integration_test.go b/integrations/integration_test.go
index a0271ce6bf..77a5a2b727 100644
--- a/integrations/integration_test.go
+++ b/integrations/integration_test.go
@@ -60,15 +60,21 @@ func TestMain(m *testing.M) {
}
func initIntegrationTest() {
- if setting.CustomConf = os.Getenv("GITEA_CONF"); setting.CustomConf == "" {
- fmt.Println("Environment variable $GITEA_CONF not set")
+ giteaRoot := os.Getenv("GITEA_ROOT")
+ if giteaRoot == "" {
+ fmt.Println("Environment variable $GITEA_ROOT not set")
os.Exit(1)
}
- if giteaRoot := os.Getenv("GITEA_ROOT"); giteaRoot == "" {
- fmt.Println("Environment variable $GITEA_ROOT not set")
+ setting.AppPath = path.Join(giteaRoot, "gitea")
+
+ giteaConf := os.Getenv("GITEA_CONF")
+ if giteaConf == "" {
+ fmt.Println("Environment variable $GITEA_CONF not set")
os.Exit(1)
+ } else if !path.IsAbs(giteaConf) {
+ setting.CustomConf = path.Join(giteaRoot, giteaConf)
} else {
- setting.AppPath = path.Join(giteaRoot, "gitea")
+ setting.CustomConf = giteaConf
}
setting.NewContext()