Commit 3223f2fb authored by Ari Trachtenberg's avatar Ari Trachtenberg
Browse files

Fixes

parent 54d1339b
Loading
Loading
Loading
Loading
+9 −0
Original line number Diff line number Diff line
@@ -109,11 +109,20 @@ bool test_labThree_pThree() {


int main() {
  cout << "test" << endl;
    bool t0 = test_labThree_pZero();

  cout << "test" << endl;
    bool t1 = test_labThree_pOne();

  cout << "test" << endl;
    bool t2 = test_labThree_pTwo();

  cout << "test" << endl;
    bool t3 = test_labThree_pThree();

  cout << "test" << endl;

    cout << endl << endl << endl;

    cout << "pZero: " << (t0 ? "passed" : "failed") << endl;
+2 −2
Original line number Diff line number Diff line
@@ -9,14 +9,14 @@ COMMON_SRCS = Support/Common.cpp
LAB0_SRCS = LabZero.cpp lab0.cpp $(COMMON_SRCS)
LAB1_SRCS = LabOne.cpp lab1.cpp $(COMMON_SRCS)
LAB2_SRCS = LabTwo.cpp lab2.cpp
LAB3_SRCS = LabThree.cpp $(COMMON_SRCS)
LAB3_SRCS = LabThree.cpp

# Object files
COMM_OBJS = Support/Common.o
LAB0_OBJS = LabZero.o lab0.o $(COMM_OBJS)
LAB1_OBJS = LabOne.o lab1.o $(COMM_OBJS)
LAB2_OBJS = LabTwo.o lab2.o
LAB3_OBJS = LabThree.o $(COMM_OBJS)
LAB3_OBJS = LabThree.o
OBJS = $(COMM_OBJS) $(LAB0_OBJS) $(LAB1_OBJS) $(LAB2_OBJS) $(LAB3_OBJS)

# Executable names