Revert "THRIFT-3443 Thrift include can generate uncompilable code"

This reverts commit ef3cf819e1.

Also disables tutorial build for Go on Travis to avoid failure caused
by this revert.
This commit is contained in:
Nobuaki Sukegawa 2015-12-01 23:49:53 +09:00
parent 665844e60f
commit 73fae0fbb7
2 changed files with 3 additions and 2 deletions

View File

@ -99,8 +99,9 @@ env:
- TEST_NAME="compiler (automake)"
CONFIG="--disable-libs"
# TODO: Enable tutorial once "make check -C tutorial/go" is fixed
- TEST_NAME="C C# D Dart Erlang Go Haxe (automake)"
CONFIG="--without-cpp --without-haskell --without-java --without-lua --without-nodejs --without-perl --without-php --without-php_extension --without-python --without-ruby"
CONFIG="--without-cpp --without-haskell --without-java --without-lua --without-nodejs --without-perl --without-php --without-php_extension --without-python --without-ruby --enable-tutorial=no"
ALL_DEPS="yes"
- TEST_NAME="Java Lua Node.js Perl PHP Python Ruby (automake)"

View File

@ -782,7 +782,7 @@ string t_go_generator::render_included_programs() {
}
}
result += "\t_ \"" + gen_package_prefix_ + go_module + "\"\n";
result += "\t\"" + gen_package_prefix_ + go_module + "\"\n";
}
return result;