Merge pull request #2990 from rintaro/tests-substitution-utils-missing

[tests] Fix missing %utils and %gyb utilization

Author: gribozavr

validation-test/Python/gyb.swift

@@ -1,4 +1,4 @@
-// RUN: %{python} -m doctest %S/../../utils/gyb.py
-// RUN: echo 'Hello ${ME}' | %S/../../utils/gyb --test -DME=Swift | FileCheck %s
-// RUN: echo 'Hello ${ME}' | %S/../../utils/gyb --verbose-test -DME=Swift | FileCheck %s
+// RUN: %{python} -m doctest %utils/gyb.py
+// RUN: echo 'Hello ${ME}' | %gyb --test -DME=Swift | FileCheck %s
+// RUN: echo 'Hello ${ME}' | %gyb --verbose-test -DME=Swift | FileCheck %s
 // CHECK: Hello Swift

validation-test/stdlib/UnicodeTrie.swift.gyb

@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-// RUN: rm -rf %t && mkdir -p %t && %gyb -DunicodeGraphemeBreakPropertyFile=%S/../../utils/UnicodeData/GraphemeBreakProperty.txt -DunicodeGraphemeBreakTestFile=%S/../../utils/UnicodeData/GraphemeBreakTest.txt %s -o %t/UnicodeTrie.swift
+// RUN: rm -rf %t && mkdir -p %t && %gyb -DunicodeGraphemeBreakPropertyFile=%utils/UnicodeData/GraphemeBreakProperty.txt -DunicodeGraphemeBreakTestFile=%utils/UnicodeData/GraphemeBreakTest.txt %s -o %t/UnicodeTrie.swift
 // RUN: %line-directive %t/UnicodeTrie.swift -- %target-build-swift %t/UnicodeTrie.swift -o %t/a.out -g -Xfrontend -disable-access-control
 // RUN: %line-directive %t/UnicodeTrie.swift -- %target-run %t/a.out
 // REQUIRES: executable_test