Changeset ea5b7d6

Timestamp:

Aug 10, 2018, 1:05:20 PM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer, pthread-emulation, qualifiedEnum

Children:

0c1b566

Parents:

455a7d5

Message:

Fixed jenkins after rework of automake

Files:

• .gitignore (modified) (1 diff)
• Jenkinsfile (modified) (3 diffs)

.gitignore

@@ -28 +28 @@
 
 # src executables, for lib and bin
-src/driver/as
-src/driver/cfa
-src/driver/cfa-cpp
-src/driver/cc1
+driver/as
+driver/cfa
+driver/cfa-cpp
+driver/cc1
 
-src/prelude/bootloader.c
-src/prelude/builtins.cf
-src/prelude/extras.cf
-src/prelude/gcc-builtins.cf
-src/prelude/gcc-builtins.c
-src/prelude/prelude.cf
-src/libcfa/libcfa-prelude.c
+libcfa/prelude/bootloader.c
+libcfa/prelude/builtins.cf
+libcfa/prelude/extras.cf
+libcfa/prelude/gcc-builtins.cf
+libcfa/prelude/gcc-builtins.c
+libcfa/prelude/prelude.cf
+libcfa/x64-debug/
+libcfa/x64-nodebug/
+libcfa/x64-nolib/
+libcfa/x86-debug/
+libcfa/x86-nodebug/
+libcfa/x86-nolib/
+libcfa/arm-debug/
+libcfa/arm-nodebug/
+libcfa/arm-nolib/
+
 
 # generated by bison and lex from parser.yy and lex.ll

Jenkinsfile

@@ -277 +277 @@
                         //Use the current directory as the installation target so nothing escapes the sandbox
                         //Also specify the compiler by hand
-                        sh "${srcdir}/configure CXX=${compiler.cpp_cc} ${architecture} --with-backend-compiler=${compiler.cfa_cc} --enable-silent-rules --quiet"
+                        sh "${srcdir}/configure CXX=${compiler.cpp_cc} ${architecture} --with-backend-compiler=${compiler.cfa_cc} --quiet"
 
                         //Compile the project
@@ -291 +291 @@
                         //Run the tests from the tests directory
                         if ( do_alltests ) {
-                                sh 'make --no-print-directory -C src/tests all-tests debug=yes'
-                                sh 'make --no-print-directory -C src/tests all-tests debug=no '
+                                sh 'make --no-print-directory -C tests all-tests debug=yes'
+                                sh 'make --no-print-directory -C tests all-tests debug=no '
                         }
                         else {
-                                sh 'make --no-print-directory -C src/tests'
+                                sh 'make --no-print-directory -C tests'
                         }
                 }
@@ -308 +308 @@
                 dir (builddir) {
                         //Append bench results
-                        sh "make --no-print-directory -C src/benchmark jenkins githash=${gitRefNewValue} arch=${arch_name} | tee ${srcdir}/bench.json"
+                        sh "make --no-print-directory -C benchmark jenkins githash=${gitRefNewValue} arch=${arch_name} | tee ${srcdir}/bench.json"
                 }
         }