From: Brian Demsky <bdemsky@uci.edu>
Date: Fri, 15 Mar 2013 23:35:51 +0000 (-0700)
Subject: Merge branch 'master' of ssh://demsky.eecs.uci.edu/home/git/model-checker-benchmarks
X-Git-Tag: oopsla2013-final~8
X-Git-Url: http://demsky.eecs.uci.edu/git/?p=model-checker-benchmarks.git;a=commitdiff_plain;h=eb1ce023cf7eadae53e3abefddc561da3f965600

Merge branch 'master' of ssh://demsky.eecs.uci.edu/home/git/model-checker-benchmarks

Conflicts:
	bench.sh
---

eb1ce023cf7eadae53e3abefddc561da3f965600
diff --cc bench.sh
index 4bce97e,6f55ff5..a778416
--- a/bench.sh
+++ b/bench.sh
@@@ -16,21 -16,22 +16,27 @@@ BASEDIR=
  
  DIR="${BASEDIR}/run-${DATE}"
  
- TESTS="barrier/barrier"
- TESTS+=" mcs-lock/mcs-lock"
+ TESTS="chase-lev-deque/main"
  TESTS+=" spsc-queue/spsc-queue"
  TESTS+=" spsc-bugfix/spsc-queue"
- TESTS+=" dekker-fences/dekker-fences"
- #TESTS+=" mpmc-queue/mpmc-2r1w"
- #TESTS+=" mpmc-queue/mpmc-1r2w-noinit"
 +TESTS+=" mpmc-queue/mpmc-queue-rdwr"
 +TESTS+=" mpmc-queue/mpmc-rdwr-noinit"
- #TESTS+=" mpmc-queue/mpmc-queue-noinit"
+ TESTS+=" barrier/barrier"
+ TESTS+=" mcs-lock/mcs-lock"
+ TESTS+=" mpmc-queue/mpmc-rdwr-noinit"
+ TESTS+=" ms-queue/main"
  TESTS+=" linuxrwlocks/linuxrwlocks"
 +TESTS+=" chase-lev-deque/main"
 +TESTS+=" ms-queue/main"
 +
 +MODEL_ARGS="-y -m 2 -u 3"
+ 
+ #TESTS+=" dekker-fences/dekker-fences"
+ #TESTS+=" mpmc-queue/mpmc-2r1w"
+ #TESTS+=" mpmc-queue/mpmc-1r2w-noinit"
+ #TESTS+=" mpmc-queue/mpmc-queue-rdwr"
+ #TESTS+=" mpmc-queue/mpmc-queue-noinit"
+ 
 -MODEL_ARGS="-y -m 2"
  COUNT=0
  
  function run_test {