Fix setting.AppPath for integration tests (#1923)

Fix setting.AppPath for integration tests

integrations/integration_test.go

@@ -14,6 +14,7 @@ import (
 	"net/http/cookiejar"
 	"net/url"
 	"os"
+	"path"
 	"strings"
 	"testing"
 
@@ -59,13 +60,21 @@ func TestMain(m *testing.M) {
 }
 
 func initIntegrationTest() {
-	if setting.CustomConf = os.Getenv("GITEA_CONF"); setting.CustomConf == "" {
+	giteaRoot := os.Getenv("GITEA_ROOT")
-		fmt.Println("Environment variable $GITEA_CONF not set")
+	if giteaRoot == "" {
+		fmt.Println("Environment variable $GITEA_ROOT not set")
 		os.Exit(1)
 	}
-	if os.Getenv("GITEA_ROOT") == "" {
+	setting.AppPath = path.Join(giteaRoot, "gitea")
-		fmt.Println("Environment variable $GITEA_ROOT not set")
+
+	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.CustomConf = giteaConf
 	}
 
 	setting.NewContext()