Absolute path for setting.CustomConf

diff --git a/integrations/integration_test.go b/integrations/integration_test.go
index a0271ce6bf6fa59f8cd006c9f5136b49b9d453f2..77a5a2b727b01ae76781163def0cacca5fa0d746 100644 (file)
--- 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()