Commit a9125511 authored by Ari Trachtenberg's avatar Ari Trachtenberg
Browse files

Merge branch 'ciBugs' into 'master' 

added lab2 to gitlab ci pipeline

See merge request !5
parents 335eebc1 43f7e221

ci_cd/.gitlab-ci.yml

+3 −1
Original line number Diff line number Diff line
@@ -2,9 +2,11 @@ stages: 
  - labm1

  - lab0

  - lab1

  - lab2

  - tests



include:

  - local: 'ci_cd/labm1.yml'   # Lab -1

  - local: 'ci_cd/lab0.yml'    # Lab 0

  - local: 'ci_cd/lab1.yml'    # Lab 1

  - local: 'ci_cd/lab2.yml'    # Lab 2
 
 No newline at end of file

problems/LabTwo_ChapterSix.h

+2 −2
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
 * @param arr An array of [size] integers

 * @param size The number of integers stored in array [arr]

 * @return The sum of the following for [arr]:

 *    * Every element at even index.

 *    * Every element at even index or zero index

 *    * Every even element.

 *    * The product of the first and last element.

 *
@@ -84,6 +84,6 @@ bool labTwo_pOne(int arr1[], int arr2[], int size); 
 *      5 10 11  8

 *      9  6  7 12

 *      4 15 14  1

 *   The sum of any row, column, or diagonal of the matrix equals 15.

 *   The sum of any row, column, or diagonal of the matrix equals 34.

 */

bool labTwo_pTwo(int arr[], int size);
 
 No newline at end of file

tests/LabTwo.cpp

+0 −3
Original line number Diff line number Diff line
@@ -72,7 +72,6 @@ bool test_labOne_pTwo() { 
        cout << "Test 2b failed" << endl;

        return false;

    }



    //test 2

    if (!labTwo_pTwo(arr2,16)){

        cout << "Test 2c failed" << endl;
@@ -96,7 +95,6 @@ bool test_labOne_pThree() { 
        cout << "Test 3a failed" << endl;

        return false;

    }



    //test 1

    if (*test1 != 6){

        cout << "Test 3b failed" << endl;
@@ -125,7 +123,6 @@ bool test_labOne_pFour() { 
        cout << "Test 4a failed" << endl;

        return false;

    }



    //test 1

    if (strcmp(result1,"BostonUniversity") != 0){

        cout << "Test 4b failed" << endl;