3 files changed, 89 insertions, 0 deletions

diff --git a/recipes-devtools/protobuf/files/disable_tests.patch b/recipes-devtools/protobuf/files/disable_tests.patch
new file mode 100644
index 00000000..f5e71ca6
--- /dev/null
+++ b/recipes-devtools/protobuf/files/disable_tests.patch
@@ -0,0 +1,19 @@
+diff -Naur protobuf-c-0.15.old/src/Makefile.am protobuf-c-0.15/src/Makefile.am
+--- protobuf-c-0.15.old/src/Makefile.am 2012-11-28 14:59:57.845251943 +0100
++++ protobuf-c-0.15/src/Makefile.am     2012-11-28 15:00:23.549252632 +0100
+@@ -1,5 +1,5 @@
+ if BUILD_PROTOC_C
+-SUBDIRS = . test
++
+ bin_PROGRAMS = protoc-c
+ protoc_c_SOURCES = \
+ google/protobuf/compiler/c/c_service.cc \
+@@ -23,7 +23,7 @@
+ lib_LTLIBRARIES = libprotobuf-c.la
+ protobufcincludedir = $(includedir)/google/protobuf-c
+
+-EXTRA_DIST = CMakeLists.txt test/CMakeLists.txt
++EXTRA_DIST = CMakeLists.txt
+
+ libprotobuf_c_la_SOURCES = \
+ google/protobuf-c/protobuf-c-dispatch.c \
diff --git a/recipes-devtools/protobuf/files/protobuf-allow-running-python-scripts-from-anywhere.patch b/recipes-devtools/protobuf/files/protobuf-allow-running-python-scripts-from-anywhere.patch
new file mode 100644
index 00000000..8b293428
--- /dev/null
+++ b/recipes-devtools/protobuf/files/protobuf-allow-running-python-scripts-from-anywhere.patch
@@ -0,0 +1,38 @@
+From 46e331263eb92e47510e88478b255f226d30245c Mon Sep 17 00:00:00 2001
+From: Keith Holman <Keith.Holman@windriver.com>
+Date: Mon, 18 Aug 2014 15:19:35 -0400
+Subject: [PATCH] protobuf: allow running python scripts from anywhere
+
+The Makefile to generate the examples with Google Protocol Buffers
+generates some scripts for python.  However, these generated scripts
+only work if they are ran in the same directory as the source files.
+This fix generates scripts to execute from anywhere on the system.
+
+Signed-off-by: Keith Holman <Keith.Holman@windriver.com>
+---
+ examples/Makefile | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/examples/Makefile b/examples/Makefile
+index 8dc9083..a993d63 100644
+--- a/examples/Makefile
++++ b/examples/Makefile
+@@ -48,11 +48,13 @@ list_people_java: javac_middleman
+ add_person_python: add_person.py protoc_middleman
+        @echo "Writing shortcut script add_person_python..."
+        @echo '#! /bin/sh' > add_person_python
+-       @echo './add_person.py "$$@"' >> add_person_python
++       @echo 'SCRIPT_DIR=$$(dirname $$0)' >> add_person_python
++       @echo '$$SCRIPT_DIR/add_person.py "$$@"' >> add_person_python
+        @chmod +x add_person_python
+
+ list_people_python: list_people.py protoc_middleman
+        @echo "Writing shortcut script list_people_python..."
+        @echo '#! /bin/sh' > list_people_python
+-       @echo './list_people.py "$$@"' >> list_people_python
++       @echo 'SCRIPT_DIR=$$(dirname $$0)' >> list_people_python
++       @echo '$$SCRIPT_DIR/list_people.py "$$@"' >> list_people_python
+        @chmod +x list_people_python
+--
+1.9.3
+
diff --git a/recipes-devtools/protobuf/files/run-ptest b/recipes-devtools/protobuf/files/run-ptest
new file mode 100755
index 00000000..a5a7b0f9
--- /dev/null
+++ b/recipes-devtools/protobuf/files/run-ptest
@@ -0,0 +1,32 @@
+#!/bin/bash
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+TEST_FILE="/tmp/test.data"
+
+RETVAL=0
+# Test every writing test application
+for write_exe_full_path in ${DIR}/add_person_*; do
+        if [ -x "${write_exe_full_path}" ]; then
+                write_exe=`basename ${write_exe_full_path}`
+                echo "Generating new test file using ${write_exe}..."
+                ${write_exe_full_path} "${TEST_FILE}"
+                RETVAL=$?
+
+                # Test every reading test application
+                for read_exe_full_path in ${DIR}/list_people_*; do
+                        read_exe=`basename ${read_exe_full_path}`
+                        echo "Test: Write with ${write_exe}; Read with ${read_exe}..."
+                        if [ -x "${read_exe_full_path}" ]; then
+                                ${read_exe_full_path} "${TEST_FILE}"
+                                RETVAL=$?
+                        fi
+                done
+
+                # Cleanup...
+                if [ -e "${TEST_FILE}" ]; then
+                        rm "${TEST_FILE}"
+                fi
+        fi
+done
+
+exit $RETVAL
+