Updated for travis

pakozm · May 20, 2014 · 9dad7ad · 9dad7ad
1 parent cad4a4a
commit 9dad7ad
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 20 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,7 @@
 before_install:
   - sudo apt-get update -qq
   - sudo apt-get install -y liblua5.2-dev libboost-filesystem-dev libboost-filesystem-dev libboost-thread-dev
+  - lua -e "print('hola')"
   - git clone https://github.com/mongodb/mongo-cxx-driver.git
   - cd mongo-cxx-driver && sudo scons --prefix=/usr install-mongoclient && cd -
   - wget https://github.com/moai/luamongo/archive/v0.4.1.tar.gz

diff --git a/execute_example_worker.sh b/execute_example_worker.sh
@@ -1,3 +1,2 @@
 #!/bin/bash
-export lua=lua5.2
-$lua execute_worker.lua localhost wordcount
+lua execute_worker.lua localhost wordcount
diff --git a/test.sh b/test.sh
@@ -1,7 +1,5 @@
 #!/bin/bash
-which lua
-export lua=lua5.2
-$lua mapreduce/test.lua
+lua mapreduce/test.lua
 
 if [[ $? -ne 0 ]]; then
     echo "ERROR"
@@ -10,25 +8,18 @@ fi
 for storage in gridfs shared sshfs; do
     ## COMBINER + ASSOCIATIVE COMMUTATIVE IDEMPOTENT REDUCER
     screen -d -m ./execute_example_worker.sh
-    diff <($lua execute_server.lua localhost wordcount \
-        mapreduce.examples.WordCount.taskfn \
-        mapreduce.examples.WordCount.mapfn \
-        mapreduce.examples.WordCount.partitionfn \
-        mapreduce.examples.WordCount.reducefn \
-        mapreduce.examples.WordCount.finalfn \
-        mapreduce.examples.WordCount.reducefn \
-        $storage | awk '{ print $1,$2 }' | sort) \
+    diff <(./execute_example_server.sh $storage | awk '{ print $1,$2 }' | sort) \
         <(cat mapreduce/server.lua \
         mapreduce/worker.lua \
         mapreduce/test.lua \
-        mapreduce/utils.lua | $lua misc/naive.lua | awk '{ print $1,$2 }' | sort) > /dev/null
+        mapreduce/utils.lua | lua misc/naive.lua | awk '{ print $1,$2 }' | sort) > /dev/null
     if [[ $? -ne 0 ]]; then
         echo "ERROR"
         exit 1
     fi
     ## NO COMBINER + ASSOCIATIVE COMMUTATIVE IDEMPOTENT REDUCER
     screen -d -m ./execute_example_worker.sh
-    diff <($lua execute_server.lua localhost wordcount \
+    diff <(lua execute_server.lua localhost wordcount \
         mapreduce.examples.WordCount.taskfn \
         mapreduce.examples.WordCount.mapfn \
         mapreduce.examples.WordCount.partitionfn \
@@ -38,14 +29,14 @@ for storage in gridfs shared sshfs; do
         <(cat mapreduce/server.lua \
         mapreduce/worker.lua \
         mapreduce/test.lua \
-        mapreduce/utils.lua | $lua misc/naive.lua | awk '{ print $1,$2 }' | sort) > /dev/null
+        mapreduce/utils.lua | lua misc/naive.lua | awk '{ print $1,$2 }' | sort) > /dev/null
     if [[ $? -ne 0 ]]; then
         echo "ERROR"
         exit 1
     fi
     ## NO COMBINER + GENERAL REDUCER
     screen -d -m ./execute_example_worker.sh
-    diff <($lua execute_server.lua localhost wordcount \
+    diff <(lua execute_server.lua localhost wordcount \
         mapreduce.examples.WordCount.taskfn \
         mapreduce.examples.WordCount.mapfn \
         mapreduce.examples.WordCount.partitionfn \
@@ -55,14 +46,14 @@ for storage in gridfs shared sshfs; do
         <(cat mapreduce/server.lua \
         mapreduce/worker.lua \
         mapreduce/test.lua \
-        mapreduce/utils.lua | $lua misc/naive.lua | awk '{ print $1,$2 }' | sort) > /dev/null
+        mapreduce/utils.lua | lua misc/naive.lua | awk '{ print $1,$2 }' | sort) > /dev/null
     if [[ $? -ne 0 ]]; then
         echo "ERROR"
         exit 1
     fi
     ## INIT SCRIPT
     screen -d -m ./execute_example_worker.sh
-    diff <($lua execute_server.lua localhost wordcount \
+    diff <(lua execute_server.lua localhost wordcount \
         mapreduce.examples.WordCount \
         mapreduce.examples.WordCount \
         mapreduce.examples.WordCount \
@@ -73,7 +64,7 @@ for storage in gridfs shared sshfs; do
         <(cat mapreduce/server.lua \
         mapreduce/worker.lua \
         mapreduce/test.lua \
-        mapreduce/utils.lua | $lua misc/naive.lua | awk '{ print $1,$2 }' | sort) > /dev/null
+        mapreduce/utils.lua | lua misc/naive.lua | awk '{ print $1,$2 }' | sort) > /dev/null
     if [[ $? -ne 0 ]]; then
         echo "ERROR"
         exit 1