diff --git a/_examples/file-server/embedding-files-into-app/main_test.go b/_examples/file-server/embedding-files-into-app/main_test.go index 27f391cc..4c1c0531 100644 --- a/_examples/file-server/embedding-files-into-app/main_test.go +++ b/_examples/file-server/embedding-files-into-app/main_test.go @@ -55,6 +55,7 @@ func (r resource) loadFromBase(dir string) string { if runtime.GOOS != "windows" { result = strings.Replace(result, "\n", "\r\n", -1) + result = strings.Replace(result, "\r\r", "", -1) } return result } diff --git a/_examples/file-server/single-page-application/embedded-single-page-application/main_test.go b/_examples/file-server/single-page-application/embedded-single-page-application/main_test.go index dc4807b9..3d07a4b4 100644 --- a/_examples/file-server/single-page-application/embedded-single-page-application/main_test.go +++ b/_examples/file-server/single-page-application/embedded-single-page-application/main_test.go @@ -48,6 +48,7 @@ func (r resource) loadFromBase(dir string) string { result := string(b) if runtime.GOOS != "windows" { result = strings.Replace(result, "\n", "\r\n", -1) + result = strings.Replace(result, "\r\r", "", -1) } return result } diff --git a/_examples/http_responsewriter/content-negotiation/main_test.go b/_examples/http_responsewriter/content-negotiation/main_test.go index e31f6af1..08c5e5a6 100644 --- a/_examples/http_responsewriter/content-negotiation/main_test.go +++ b/_examples/http_responsewriter/content-negotiation/main_test.go @@ -7,6 +7,7 @@ import ( "io/ioutil" "testing" + "github.com/kataras/iris/v12" "github.com/kataras/iris/v12/httptest" ) @@ -20,7 +21,9 @@ func TestContentNegotiation(t *testing.T) { expectedHTMLResponse = "

Test Name

Age 26

" ) - e := httptest.New(t, newApp()) + app := newApp() + app.Configure(iris.WithOptimizations) + e := httptest.New(t, app) e.GET("/resource").WithHeader("Accept", "application/json"). Expect().Status(httptest.StatusOK). diff --git a/core/router/api_builder.go b/core/router/api_builder.go index 4f2c5445..7d53ca95 100644 --- a/core/router/api_builder.go +++ b/core/router/api_builder.go @@ -1060,7 +1060,13 @@ func getCaller() (string, int) { continue } - if !strings.Contains(file, "/kataras/iris") || strings.Contains(file, "/kataras/iris/_examples") || strings.Contains(file, "iris-contrib/examples") { + if strings.Contains(file, ".amd64/src/") { + continue + } + + if !strings.Contains(file, "/kataras/iris") || + strings.Contains(file, "/kataras/iris/_examples") || + strings.Contains(file, "iris-contrib/examples") { if relFile, err := filepath.Rel(wd, file); err == nil { file = "./" + relFile }