diff --git a/Makefile.am b/Makefile.am index d54d9d3..15af739 100644 --- a/Makefile.am +++ b/Makefile.am @@ -315,10 +315,10 @@ pyc_PYTHON = \ # DEJATOOL = src/testsuite/example-test.exp -noinst_PROGRAMS = test-python_loader +noinst_PROGRAMS = src/testsuite/test-python_loader # Shouldn't need Gtkmm! This is a coding anomaly -test_python_loader_CPPFLAGS = \ +src_testsuite_test_python_loader_CPPFLAGS = \ -I@top_srcdir@/src \ -DPYCDIR="\"$(pycdir)\"" \ -DMODDIR="\"$(moddir)\"" \ @@ -326,10 +326,10 @@ test_python_loader_CPPFLAGS = \ $(GLIBMM_CFLAGS) \ $(GTKMM_CFLAGS) \ $(GTHREAD_CFLAGS) -test_python_loader_LDFLAGS = \ +src_testsuite_test_python_loader_LDFLAGS = \ src/backend/pyloader/libpyloader.la \ $(GTKMM_LIBS) $(GTHREAD_LIBS) -test_python_loader_SOURCES = \ +src_testsuite_test_python_loader_SOURCES = \ src/testsuite/test-python_loader.cc \ src/start_gui.cc \ src/standard_io.cc \ diff --git a/src/builtin-policies/fcfs.py b/src/builtin-policies/fcfs.py index ad7fcd2..250f6e4 100644 --- a/src/builtin-policies/fcfs.py +++ b/src/builtin-policies/fcfs.py @@ -15,13 +15,8 @@ class fcfs(Policy) : return -1 def sort_queue(self, event, queue): - print 'Entering sort_queue' cmpf = lambda a, b: \ a.get_schedulable().get_arrival_time() < \ b.get_schedulable().get_arrival_time() - try: - self.sort(queue,cmpf) - except: - print "Unexpected error:", sys.exc_info()[0] - raise + self.sort(queue,cmpf)