Merge branch 'master' of https://github.com/postgrespro/pg_dtm

knizhnik · knizhnik · commit cccd301b1c5e · 2015-11-18T15:38:43.000+03:00
diff --git a/tests/deploy_layouts/cluster.yml b/tests/deploy_layouts/cluster.yml
@@ -41,6 +41,33 @@
     environment:
       LD_LIBRARY_PATH: "{{pg_dst}}/lib/"
 
+  - name: copy transfers source
+    copy: src=../{{item}} dest=~/{{item}} mode=0755
+    with_items:
+      - "dtmbench.cpp"
+
+  - name: clone pqxx
+    git: repo=https://github.com/Ambrosys/pqxx.git
+      dest=~/pqxx
+      accept_hostkey=yes
+      update=no
+      force=yes
+    register: pqxx
+
+  - name: build pqxx
+    shell: "./configure --prefix=/home/{{ansible_ssh_user}}/pg_cluster/install/ --enable-shared && make -j4 && make install"
+    args:
+      chdir: "~/pqxx"
+    environment:
+      PATH: "/home/{{ansible_ssh_user}}/pg_cluster/install/bin/:{{ansible_env.PATH}}"
+    when: pqxx.changed
+
+  - name: compile dtmbench
+    shell: "g++ -g -Wall -O2 -o dtmbench dtmbench.cpp -lpqxx -lpq -pthread -L/home/{{ansible_ssh_user}}/pg_cluster/install/lib/ -I/home/{{ansible_ssh_user}}/pg_cluster/install/include/"
+
+  - name: move dtmbench to bin
+    shell: "mv dtmbench ~/pg_cluster/install/bin/dtmbench"
+
 - hosts: nodes[0]
   tasks:
   - name: build dtmd
diff --git a/tests/perf.yml b/tests/perf.yml
@@ -15,23 +15,14 @@
     set_fact:
       connections: "{{ connstrs.results | map(attribute='ansible_facts.connstr') | join }}"
 
-  - name: copy transfers source
-    copy: src=./{{item}} dest=~/{{item}} mode=0755
-    with_items:
-      - "dtmbench.cpp"
-
-  - name: compile dtmbench
-    shell: "g++ -g -Wall -O2 -o dtmbench dtmbench.cpp -lpqxx -lpq -pthread"
-
-  - name: compile dtmbench
-    shell: "mv dtmbench ~/pg_cluster/install/bin/dtmbench"
-
 - hosts: clients[0]
   gather_facts: no
   tasks:
   - name: init database
     shell: "~/pg_cluster/install/bin/dtmbench {{connections}} -a 500000 -i"
     register: init_result
+    environment:
+      LD_LIBRARY_PATH: "/home/{{ansible_ssh_user}}/pg_cluster/install/lib"
   - debug: var=init_result
 
 - hosts: clients
