Skip to content

Commit

Permalink
Show invocation line for failing test
Browse files Browse the repository at this point in the history
  • Loading branch information
kovidgoyal committed Jul 4, 2023
1 parent 9df8257 commit 8c4c850
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 1 deletion.
3 changes: 2 additions & 1 deletion tools/rsync/api_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ func run_roundtrip_test(t *testing.T, src_data, changed []byte, num_of_patches,
using_serialization := false
prefix_msg := func() string {
q := utils.IfElse(using_serialization, "with", "without")
return fmt.Sprintf("Running %s serialization: src size: %d changed size: %d difference: %d\n", q, len(src_data), len(changed), len(changed)-len(src_data))
return fmt.Sprintf("%s: Running %s serialization: src size: %d changed size: %d difference: %d\n",
utils.SourceLoc(1), q, len(src_data), len(changed), len(changed)-len(src_data))
}

test_equal := func(src_data, output []byte) {
Expand Down
24 changes: 24 additions & 0 deletions tools/utils/misc.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@ package utils
import (
"fmt"
"os"
"path/filepath"
"reflect"
"runtime"
"strconv"

"golang.org/x/exp/constraints"
Expand Down Expand Up @@ -270,3 +272,25 @@ func IfElse[T any](condition bool, if_val T, else_val T) T {
}
return else_val
}

func SourceLine(skip_frames ...int) int {
s := 1
if len(skip_frames) > 0 {
s += skip_frames[0]
}
if _, _, ans, ok := runtime.Caller(s); ok {
return ans
}
return -1
}

func SourceLoc(skip_frames ...int) string {
s := 1
if len(skip_frames) > 0 {
s += skip_frames[0]
}
if _, file, line, ok := runtime.Caller(s); ok {
return filepath.Base(file) + ":" + strconv.Itoa(line)
}
return "unknown"
}

0 comments on commit 8c4c850

Please sign in to comment.