From 8dc1d94107c54325d771e99e2d94ee09661da125 Mon Sep 17 00:00:00 2001
From: Michael Hackstein <michael@arangodb.com>
Date: Fri, 29 Jan 2016 09:40:17 +0100
Subject: [PATCH 1/4] Reverted change on scripts/run of
 9c80e17716e07f0ccadf4141cb3fc8ab08845613. This allows to start the tests
 again. We still need a proper fix.

---
 scripts/run | 73 +++++++++++++++++++++--------------------------------
 1 file changed, 29 insertions(+), 44 deletions(-)

diff --git a/scripts/run b/scripts/run
index 0a44fbb4e4..bf70839e35 100755
--- a/scripts/run
+++ b/scripts/run
@@ -3,71 +3,56 @@ export PID=$$
 
 self=$0
 if test -f "${self}.js"; then 
-    export SCRIPT=${self}.js
+  export SCRIPT=${self}.js
 else
-    export SCRIPT=$1
-    shift
+  export SCRIPT=$1
+  shift
 fi
 
 if test -n "$ORIGINAL_PATH"; then
 # running in cygwin...
-    PS='\'
-    export EXT=".exe"
+  PS='\'
+  export EXT=".exe"
 else
-    export EXT=""
-    PS='/'
+  export EXT=""
+  PS='/'
 fi;
 
 LOGFILE="out${PS}log-$PID"
-DBDIR="out${PS}data-$PID"
-mkdir -p ${DBDIR}
 
 export PORT=`expr 1024 + $RANDOM`
 declare -a ARGS
 export VG=''
 export VXML=''
+
 for i in "$@"; do
-    # no valgrind on cygwin, don't care.
-    if test "$i" == valgrind; then
-      export VG='/usr/bin/valgrind --log-file=/tmp/valgrindlog.%p'
-    elif test "$i" == valgrindxml; then
-      export VG='/usr/bin/valgrind --xml=yes --xml-file=valgrind_testrunner'
-      export VXML="valgrind=\"${VG}\""
-      export VG=${VG}'.xml '
-    else
-      ARGS+=(--javascript.script-parameter)
-      ARGS+=("$i")
-    fi
+  # no valgrind on cygwin, don't care.
+  if test "$i" == valgrind; then
+    export VG='/usr/bin/valgrind --log-file=/tmp/valgrindlog.%p'
+  elif test "$i" == valgrindxml; then
+    export VG='/usr/bin/valgrind --xml=yes --xml-file=valgrind_testrunner'
+    export VXML="valgrind=\"${VG}\""
+    export VG=${VG}'.xml '
+  else
+    ARGS+=("$i")
+  fi
 done
 
-echo Database has its data in ${DBDIR}
 echo Logfile is in ${LOGFILE}
-$VG bin/arangod \
-    --configuration none \
-    --cluster.agent-path bin${PS}etcd-arango${EXT} \
-    --cluster.arangod-path bin${PS}arangod \
-    --cluster.coordinator-config etc${PS}relative${PS}arangod-coordinator.conf \
-    --cluster.dbserver-config etc${PS}relative${PS}arangod-dbserver.conf \
-    --cluster.disable-dispatcher-frontend false \
-    --cluster.disable-dispatcher-kickstarter false \
-    --cluster.data-path cluster \
-    --cluster.log-path cluster \
-    --database.directory ${DBDIR} \
-    --log.file ${LOGFILE} \
-    --server.endpoint tcp://127.0.0.1:$PORT \
-    --javascript.startup-directory js \
-    --javascript.app-path js${PS}apps \
-    --javascript.script $SCRIPT \
-    --no-server \
-    --temp-path ${PS}var${PS}tmp \
-    "${ARGS[@]}" \
-    $VXML
+
+$VG bin/arangosh \
+  -c etc${PS}relative${PS}arangosh.conf \
+  --server.endpoint tcp://127.0.0.1:${PORT} \
+  --javascript.execute scripts${PS}unittest.js \
+  -- \
+  "${ARGS[@]}" \
+  $VXML
 
 if test $? -eq 0; then
-  echo "removing ${LOGFILE} ${DBDIR}"
-  rm -rf ${LOGFILE} ${DBDIR}
+  echo "removing ${LOGFILE}"
+  rm -rf ${LOGFILE}
 else
-  echo "failed - don't remove ${LOGFILE} ${DBDIR} - here's the logfile:"
+  echo "failed - don't remove ${LOGFILE} - here's the logfile:"
   cat ${LOGFILE}
 fi
 

From 61c8941ac9cbda5bcf3ef67db60cf66ea3c94492 Mon Sep 17 00:00:00 2001
From: Wilfried Goesgens <willi@arangodb.com>
Date: Fri, 29 Jan 2016 09:57:20 +0100
Subject: [PATCH 2/4] Remove unneccesary copy of va_args

---
 lib/Basics/win-utils.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/lib/Basics/win-utils.cpp b/lib/Basics/win-utils.cpp
index 993d1251e2..759e495c57 100644
--- a/lib/Basics/win-utils.cpp
+++ b/lib/Basics/win-utils.cpp
@@ -558,8 +558,6 @@ void TRI_WindowsEmergencyLog(char const* func, char const* file, int line,
   va_list ap;
 
   va_start(ap, fmt);
-  va_list wva;
-  va_copy(wva, ap);
   TRI_LogWindowsEventlog(func, file, line, fmt, ap);
   va_end(wva);
 }

From 89db215369e79d45b0d3d0f08bb7f0927297fadc Mon Sep 17 00:00:00 2001
From: Jana <speaker@arangodb.org>
Date: Fri, 29 Jan 2016 10:29:30 +0100
Subject: [PATCH 3/4] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 82aa487a77..67c68a48f8 100644
--- a/README.md
+++ b/README.md
@@ -61,7 +61,7 @@ Other features of ArangoDB include:
 For more in-depth information read the [design goals of ArangoDB](http://www.arangodb.com/2012/03/07/avocadodbs-design-objectives)
 
 
-Latest Release - ArangoDB 2.6
+Latest Release - ArangoDB 2.8
 -----------------
 
 The [What's new in ArangoDB 2.6](https://docs.arangodb.com/NewFeatures/NewFeatures26.html) can be found in the documentation.

From e40d0595105bea0100a9a4ae30286d7e97e4d94d Mon Sep 17 00:00:00 2001
From: Jana <speaker@arangodb.org>
Date: Fri, 29 Jan 2016 10:52:33 +0100
Subject: [PATCH 4/4] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 67c68a48f8..82aa487a77 100644
--- a/README.md
+++ b/README.md
@@ -61,7 +61,7 @@ Other features of ArangoDB include:
 For more in-depth information read the [design goals of ArangoDB](http://www.arangodb.com/2012/03/07/avocadodbs-design-objectives)
 
 
-Latest Release - ArangoDB 2.8
+Latest Release - ArangoDB 2.6
 -----------------
 
 The [What's new in ArangoDB 2.6](https://docs.arangodb.com/NewFeatures/NewFeatures26.html) can be found in the documentation.