From e3adce83eebe0dadf50113d9e2403698b6284499 Mon Sep 17 00:00:00 2001
From: Robin Sommer <robin@icir.org>
Date: Tue, 22 Jul 2014 20:25:31 -0700
Subject: [PATCH] Adding a plugin test that checks that "make install" works.

---
 cmake                                         |  2 +-
 .../plugins.bifs-and-scripts-install/output   |  7 +++
 .../Baseline/plugins.bifs-and-scripts/output  |  2 +-
 .../btest/plugins/bifs-and-scripts-install.sh | 47 +++++++++++++++++++
 4 files changed, 56 insertions(+), 2 deletions(-)
 create mode 100644 testing/btest/Baseline/plugins.bifs-and-scripts-install/output
 create mode 100644 testing/btest/plugins/bifs-and-scripts-install.sh

diff --git a/cmake b/cmake
index fd4076e487..8437fd75cf 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit fd4076e487565062d236bbe3959a6452a6ca38c7
+Subproject commit 8437fd75cf68f45db4d8305d36ba52e41d2eb76a
diff --git a/testing/btest/Baseline/plugins.bifs-and-scripts-install/output b/testing/btest/Baseline/plugins.bifs-and-scripts-install/output
new file mode 100644
index 0000000000..a4187d0f7c
--- /dev/null
+++ b/testing/btest/Baseline/plugins.bifs-and-scripts-install/output
@@ -0,0 +1,7 @@
+Demo::Foo - <Insert description> (dynamic, version 1.0)
+    [Event] plugin_event
+    [Function] hello_plugin_world
+
+plugin: automatically loaded at startup
+calling bif, Hello from the plugin!
+plugin: manually loaded
diff --git a/testing/btest/Baseline/plugins.bifs-and-scripts/output b/testing/btest/Baseline/plugins.bifs-and-scripts/output
index ef591e92aa..a082b3d690 100644
--- a/testing/btest/Baseline/plugins.bifs-and-scripts/output
+++ b/testing/btest/Baseline/plugins.bifs-and-scripts/output
@@ -1,4 +1,4 @@
-Demo::Foo - Caesar cipher rotating a string's characters by 13 places. (dynamic, version 1.0)
+Demo::Foo - <Insert description> (dynamic, version 1.0)
     [Event] plugin_event
     [Function] hello_plugin_world
 
diff --git a/testing/btest/plugins/bifs-and-scripts-install.sh b/testing/btest/plugins/bifs-and-scripts-install.sh
new file mode 100644
index 0000000000..4f0174a69f
--- /dev/null
+++ b/testing/btest/plugins/bifs-and-scripts-install.sh
@@ -0,0 +1,47 @@
+# @TEST-EXEC: ${DIST}/aux/bro-aux/plugin-support/init-plugin Demo Foo
+# @TEST-EXEC: bash %INPUT
+# @TEST-EXEC: BRO_PLUGIN_INSTALL=`pwd`/test-install make BRO=${DIST}
+# @TEST-EXEC: make install
+# @TEST-EXEC: BRO_PLUGIN_PATH=`pwd`/test-install bro -NN Demo::Foo >>output
+# @TEST-EXEC: BRO_PLUGIN_PATH=`pwd` bro demo/foo -r $TRACES/empty.trace >>output
+# @TEST-EXEC: TEST_DIFF_CANONIFIER= btest-diff output
+
+cat >scripts/__load__.bro <<EOF
+@load ./demo/foo/base/at-startup.bro
+EOF
+
+cat >scripts/demo/foo/__load__.bro <<EOF
+@load ./manually.bro
+EOF
+
+cat >scripts/demo/foo/manually.bro <<EOF
+event bro_init() &priority=-10
+        {
+        print "plugin: manually loaded";
+        }
+EOF
+
+mkdir -p scripts/demo/foo/base/
+
+cat >scripts/demo/foo/base/at-startup.bro <<EOF
+event bro_init() &priority=10
+        {
+        print "plugin: automatically loaded at startup";
+        print "calling bif", hello_plugin_world();
+        }
+EOF
+
+cat >src/functions.bif <<EOF
+function hello_plugin_world%(%): string
+        %{
+        return new StringVal("Hello from the plugin!");
+        %}
+EOF
+
+cat >activate.bro <<EOF
+@load-plugin Demo::Foo
+EOF
+
+cat >src/events.bif <<EOF
+event plugin_event%(foo: count%);
+EOF