More prep for 2.0.1:

* Fix version number test so that it accepts "2.0.1rc1".
* Add missing type_checkers.py to Makefile.am.

1 files changed, 5 insertions, 4 deletions

diff --git a/src/google/protobuf/stubs/common_unittest.cc b/src/google/protobuf/stubs/common_unittest.cc
index c339c5fd..bccc1e09 100644
--- a/src/google/protobuf/stubs/common_unittest.cc
+++ b/src/google/protobuf/stubs/common_unittest.cc
@@ -37,11 +37,12 @@ namespace {
 TEST(VersionTest, VersionMatchesConfig) {
   // Verify that the version string specified in config.h matches the one
   // in common.h.  The config.h version is a string which may have a suffix
-  // like "beta", so we remove that.
+  // like "beta" or "rc1", so we remove that.
   string version = PACKAGE_VERSION;
-  int pos = version.size();
-  while (pos > 0 && !ascii_isdigit(version[pos-1])) {
-    --pos;
+  int pos = 0;
+  while (pos < version.size() &&
+         (ascii_isdigit(version[pos]) || version[pos] == '.')) {
+    ++pos;
   }
   version.erase(pos);