Rewrite of build system.

Notable changes:
- We now only build things by default that require
  no dependencies.  So you can build upb even if you
  don't have Lua or Google protobuf installed.
- Checked in a pre-built version of the JIT, so you
  don't need Lua installed at build time to run DynASM.
  It will still notice if you change the .dasc file and
  attempt to re-run DynASM in that case.
- The build system now builds all modules of upb into
  separate libraries, reflecting the modularity that
  is already inherent in upb's design.  This should
  make it easier to trim the fat.
- removed the GDB JIT interface.  I wasn't using it
  much; using a .so is easier and more robust.

1 files changed, 0 insertions, 167 deletions

diff --git a/tests/test_vs_proto2.cc b/tests/test_vs_proto2.cc
deleted file mode 100644
index ed44a73..0000000
--- a/tests/test_vs_proto2.cc
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
- * upb - a minimalist implementation of protocol buffers.
- *
- * Copyright (c) 2011-2012 Google Inc.  See LICENSE for details.
- *
- * A test that verifies that our results are identical to proto2 for a
- * given proto type and input protobuf.
- */
-
-#define __STDC_LIMIT_MACROS  // So we get UINT32_MAX
-#include <assert.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/dynamic_message.h>
-#include <google/protobuf/message.h>
-#include <google/protobuf/text_format.h>
-#include <google/protobuf/wire_format_lite.h>
-#include <inttypes.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include "benchmarks/google_messages.pb.h"
-#include "upb/bindings/googlepb/bridge.h"
-#include "upb/def.h"
-#include "upb/handlers.h"
-#include "upb/pb/decoder.h"
-#include "upb/pb/glue.h"
-#include "upb/pb/varint.int.h"
-#include "upb_test.h"
-
-void compare_metadata(const google::protobuf::Descriptor* d,
-                      const upb::MessageDef *upb_md) {
-  ASSERT(d->field_count() == upb_md->field_count());
-  for (upb::MessageDef::const_iterator i = upb_md->begin(); i != upb_md->end();
-       ++i) {
-    const upb::FieldDef* upb_f = *i;
-    const google::protobuf::FieldDescriptor *proto2_f =
-        d->FindFieldByNumber(upb_f->number());
-    ASSERT(upb_f);
-    ASSERT(proto2_f);
-    ASSERT(upb_f->number() == proto2_f->number());
-    ASSERT(std::string(upb_f->name()) == proto2_f->name());
-    ASSERT(upb_f->descriptor_type() ==
-           static_cast<upb::FieldDef::DescriptorType>(proto2_f->type()));
-    ASSERT(upb_f->IsSequence() == proto2_f->is_repeated());
-  }
-}
-
-void print_diff(const google::protobuf::Message& msg1,
-                const google::protobuf::Message& msg2) {
-  std::string text_str1;
-  std::string text_str2;
-  google::protobuf::TextFormat::PrintToString(msg1, &text_str1);
-  google::protobuf::TextFormat::PrintToString(msg2, &text_str2);
-  fprintf(stderr, "str1: %s, str2: %s\n", text_str1.c_str(), text_str2.c_str());
-}
-
-void parse_and_compare(google::protobuf::Message *msg1,
-                       google::protobuf::Message *msg2,
-                       const upb::Handlers *protomsg_handlers,
-                       const char *str, size_t len, bool allow_jit) {
-  // Parse to both proto2 and upb.
-  ASSERT(msg1->ParseFromArray(str, len));
-
-  upb::pb::CodeCache cache;
-  ASSERT(cache.set_allow_jit(allow_jit));
-  upb::reffed_ptr<const upb::pb::DecoderMethod> decoder_method(
-      cache.GetDecoderMethod(upb::pb::DecoderMethodOptions(protomsg_handlers)));
-
-  upb::Status status;
-  upb::pb::Decoder decoder(decoder_method.get(), &status);
-  upb::Sink protomsg_sink(protomsg_handlers, msg2);
-
-  decoder.ResetOutput(&protomsg_sink);
-
-  msg2->Clear();
-  bool ok = upb::BufferSource::PutBuffer(str, len, decoder.input());
-  if (!ok) {
-    fprintf(stderr, "error parsing: %s\n", status.error_message());
-    print_diff(*msg1, *msg2);
-  }
-  ASSERT(ok);
-  ASSERT(status.ok());
-
-  // Would like to just compare the message objects themselves,  but
-  // unfortunately MessageDifferencer is not part of the open-source release of
-  // proto2, so we compare their serialized strings, which we expect will be
-  // equivalent.
-  std::string str1;
-  std::string str2;
-  msg1->SerializeToString(&str1);
-  msg2->SerializeToString(&str2);
-  if (str1 != str2) {
-    print_diff(*msg1, *msg2);
-  }
-  ASSERT(str1 == str2);
-  ASSERT(std::string(str, len) == str2);
-}
-
-void test_zig_zag() {
-  for (uint64_t num = 5; num * 1.5 < UINT64_MAX; num *= 1.5) {
-    ASSERT(upb_zzenc_64(num) ==
-           google::protobuf::internal::WireFormatLite::ZigZagEncode64(num));
-    if (num < UINT32_MAX) {
-      ASSERT(upb_zzenc_32(num) ==
-             google::protobuf::internal::WireFormatLite::ZigZagEncode32(num));
-    }
-  }
-
-}
-
-extern "C" {
-
-int run_tests(int argc, char *argv[])
-{
-  if (argc < 2) {
-    fprintf(stderr, "Usage: test_vs_proto2 <message file>\n");
-    return 1;
-  }
-  const char *message_file = argv[1];
-
-  // Read the message data itself.
-  size_t len;
-  const char *str = upb_readfile(message_file, &len);
-  if(str == NULL) {
-    fprintf(stderr, "Error reading %s\n", message_file);
-    return 1;
-  }
-
-  MESSAGE_CIDENT msg1;
-  MESSAGE_CIDENT msg2;
-
-  upb::reffed_ptr<const upb::Handlers> h(
-      upb::googlepb::WriteHandlers::New(msg1));
-
-  compare_metadata(msg1.GetDescriptor(), h->message_def());
-
-  // Run twice to test proper object reuse.
-  parse_and_compare(&msg1, &msg2, h.get(), str, len, false);
-  parse_and_compare(&msg1, &msg2, h.get(), str, len, true);
-  parse_and_compare(&msg1, &msg2, h.get(), str, len, false);
-  parse_and_compare(&msg1, &msg2, h.get(), str, len, true);
-
-  // Test with DynamicMessage.
-  google::protobuf::DynamicMessageFactory* factory =
-      new google::protobuf::DynamicMessageFactory;
-  const google::protobuf::Message* prototype =
-      factory->GetPrototype(msg1.descriptor());
-  google::protobuf::Message* dyn_msg1 = prototype->New();
-  google::protobuf::Message* dyn_msg2 = prototype->New();
-  h = upb::googlepb::WriteHandlers::New(*dyn_msg1);
-  parse_and_compare(dyn_msg1, dyn_msg2, h.get(), str, len, false);
-  parse_and_compare(dyn_msg1, dyn_msg2, h.get(), str, len, true);
-  delete dyn_msg1;
-  delete dyn_msg2;
-  delete factory;
-
-  free((void*)str);
-
-  test_zig_zag();
-
-  printf("All tests passed, %d assertions.\n", num_assertions);
-
-  google::protobuf::ShutdownProtobufLibrary();
-  return 0;
-}
-
-}