Proof using both GCC and Clang

2 files changed, 19 insertions, 3 deletions

diff --git a/acprep b/acprep
index a6efb2a7..0d7f3cd0 100755
--- a/acprep
+++ b/acprep
@@ -1673,8 +1673,17 @@ class PrepareBuild(CommandLineApp):
     def phase_rsync(self, *args):
         self.log.info('Executing phase: rsync')
 
-        source_copy_dir = join(self.ensure(self.products_directory()),
-                               'ledger-proof')
+        proof_dir = 'ledger-proof'
+
+        if self.options.python:
+            proof_dir += "-python"
+
+        if self.options.gcc47:
+            proof_dir += "-gcc47"
+        elif self.options.use_clang:
+            proof_dir += "-clang"
+
+        source_copy_dir = join(self.ensure(self.products_directory()), proof_dir)
 
         self.execute('rsync', '-a', '--delete',
                      '--exclude=.git/', '--exclude=b/',
diff --git a/tools/proof b/tools/proof
index 7eafd0ef..00c7f7d1 100755
--- a/tools/proof
+++ b/tools/proof
@@ -19,10 +19,17 @@ ledger_proof() {
     date > $LOGDIR/ledger-proof.log
 
     time nice -n 20 \
+        ./acprep --debug --enable-doxygen --universal --gcc47 -j16 proof 2>&1 | \
+        tee -a $LOGDIR/ledger-proof.log
+
+    time nice -n 20 \
+        ./acprep --debug --enable-doxygen --universal --python --gcc47 -j16 proof 2>&1 | \
+        tee -a $LOGDIR/ledger-proof.log
+
+    time nice -n 20 \
         ./acprep --debug --enable-doxygen --universal --clang -j16 proof 2>&1 | \
         tee -a $LOGDIR/ledger-proof.log
 
-    sudo rm -fr $DEST/ledger-proof
     time nice -n 20 \
         ./acprep --debug --enable-doxygen --universal --python --clang -j16 proof 2>&1 | \
         tee -a $LOGDIR/ledger-proof.log