Browse Source

Absolute path for setting.CustomConf

tags/v1.21.12.1
Ethan Koenig 8 years ago
parent
commit
23d0735f90
1 changed files with 11 additions and 5 deletions
  1. +11
    -5
      integrations/integration_test.go

+ 11
- 5
integrations/integration_test.go View File

@@ -60,15 +60,21 @@ func TestMain(m *testing.M) {
} }


func initIntegrationTest() { 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) 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) os.Exit(1)
} else if !path.IsAbs(giteaConf) {
setting.CustomConf = path.Join(giteaRoot, giteaConf)
} else { } else {
setting.AppPath = path.Join(giteaRoot, "gitea")
setting.CustomConf = giteaConf
} }


setting.NewContext() setting.NewContext()


Loading…
Cancel
Save