Skip to content

Commit b2d2e27

Browse files
committed
git-labview-integration-posix/test: rename pseudo-lv -> mock-labview
1 parent 8247807 commit b2d2e27

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

git-labview-integration-posix/test/labview_path_posix.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
LABVIEW_EXECUTABLE="pseudo-labview"
66

77
## LvCompare executable absolute path
8-
LVCOMPARE_EXECUTABLE="$(dirname "$BASH_SOURCE")/pseudo-lv"
8+
LVCOMPARE_EXECUTABLE="$(dirname "$BASH_SOURCE")/mock-labview"
99

1010
## LvMerge executable absolute path
11-
LVMERGE_EXECUTABLE="$(dirname "$BASH_SOURCE")/pseudo-lv"
11+
LVMERGE_EXECUTABLE="$(dirname "$BASH_SOURCE")/mock-labview"
1212

1313
## The location of this script. DO NOT EDIT.
1414
CONFIGURATION_SOURCE="$BASH_SOURCE"

git-labview-integration-posix/test/lv.bats renamed to git-labview-integration-posix/test/mock_labview.bats

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ setup_file() {
88
@test "Check lvcompare_as_difftool.sh" {
99
bats_require_minimum_version 1.5.0
1010
run --separate-stderr bash "$PROJECT_ROOT/git-labview-integration-posix/lvcompare_as_difftool.sh" "$PROJECT_ROOT/git-labview-integration-posix/test/labview_path_posix.config" "remote.lv" "local.lv"
11-
outputExpected="$("$PROJECT_ROOT/git-labview-integration-posix/test/pseudo-lv" "$PROJECT_ROOT/remote.lv" "$PROJECT_ROOT/local.lv" "-lvpath" "pseudo-labview" "-nobdcosm" "-nobdpos" "-nofppos")"
11+
outputExpected="$("$PROJECT_ROOT/git-labview-integration-posix/test/mock-labview" "$PROJECT_ROOT/remote.lv" "$PROJECT_ROOT/local.lv" "-lvpath" "pseudo-labview" "-nobdcosm" "-nobdpos" "-nofppos")"
1212
diff <(echo "$output") <(echo "$outputExpected")
1313
[ "$output" == "$outputExpected" ]
1414
}
1515

1616
@test "Check lvmerge_as_mergetool.sh" {
1717
bats_require_minimum_version 1.5.0
1818
run --separate-stderr bash "$PROJECT_ROOT/git-labview-integration-posix/lvmerge_as_mergetool.sh" "$PROJECT_ROOT/git-labview-integration-posix/test/labview_path_posix.config" "base.lv" "remote.lv" "local.lv" "merged.lv"
19-
outputExpected="$("$PROJECT_ROOT/git-labview-integration-posix/test/pseudo-lv" "pseudo-labview" "$PROJECT_ROOT/base.lv" "$PROJECT_ROOT/remote.lv" "$PROJECT_ROOT/local.lv" "$PROJECT_ROOT/merged.lv")"
19+
outputExpected="$("$PROJECT_ROOT/git-labview-integration-posix/test/mock-labview" "pseudo-labview" "$PROJECT_ROOT/base.lv" "$PROJECT_ROOT/remote.lv" "$PROJECT_ROOT/local.lv" "$PROJECT_ROOT/merged.lv")"
2020
diff <(echo "$output") <(echo "$outputExpected")
2121
[ "$output" == "$outputExpected" ]
2222
}

0 commit comments

Comments
 (0)