diff options
| author |  Yuchen Zeng <zyc@google.com> | 2017-01-18 18:49:07 -0800 |
|---|---|---|
| committer | Yuchen Zeng <zyc@google.com> | 2017-01-18 18:49:07 -0800 |
| commit | 04ec4701e303b8b41d90d5ce6861689c7f0fab7f (patch) | |
| tree | b37a55fead11bb07956718671aa1b1ed1bbb3991 /tools/buildgen | |
| parent | b0023d25dc783ba77164c03a39bb7dcc7e446fe8 (diff) | |
| parent | 6da1dc87aa3384594e9ab6218b1e0886573108de (diff) | |
Merge remote-tracking branch 'upstream/master' into cares_buildin
Diffstat (limited to 'tools/buildgen')
| -rw-r--r-- | tools/buildgen/generate_build_additions.sh | 4 | ||||
| -rwxr-xr-x | tools/buildgen/generate_projects.py | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/tools/buildgen/generate_build_additions.sh b/tools/buildgen/generate_build_additions.sh index fb9732b50d..9b5e2113af 100644 --- a/tools/buildgen/generate_build_additions.sh +++ b/tools/buildgen/generate_build_additions.sh @@ -28,9 +28,11 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +set -e + gen_build_yaml_dirs=" \ src/boringssl \ - src/google_benchmark \ + src/benchmark \ src/proto \ src/zlib \ src/c-ares \ diff --git a/tools/buildgen/generate_projects.py b/tools/buildgen/generate_projects.py index 5e78ad52d6..f8ddaf4963 100755 --- a/tools/buildgen/generate_projects.py +++ b/tools/buildgen/generate_projects.py @@ -36,7 +36,7 @@ import shutil import sys import tempfile import multiprocessing -sys.path.append(os.path.join(os.path.dirname(sys.argv[0]), '..', 'run_tests')) +sys.path.append(os.path.join(os.path.dirname(sys.argv[0]), '..', 'run_tests', 'python_utils')) assert sys.argv[1:], 'run generate_projects.sh instead of this directly' |