Fixed execdir absolute directory issue

Yangzheng Bai · Yangzheng Bai · commit 58ea84797a4f · 2018-06-18T11:22:31.000-05:00
The corrent default unittest output:

$ ./test_lockhammer.py
{'globalcfg': {'execdir': '../build', 'logfile': 'lockhammer.csv'},
 'sweeptest': {'argulist': [{'a': 5000, 'c': '0ns', 'p': '0ns'},
                            {'a': 5000, 'c': '1000ns', 'p': '0ns'},
                            {'a': 5000, 'c': '200ns', 'p': '1000ns'},
                            {'a': 5000, 'c': '1000ns', 'p': '5000ns'}],
               'argumax': 0,
               'cmd': ['lh_cas_event_mutex',
                       'lh_cas_lockref',
                       'lh_cas_rw_lock',
                       'lh_empty',
                       'lh_event_mutex',
                       'lh_incdec_refcount',
                       'lh_jvm_objectmonitor',
                       'lh_osq_lock',
                       'lh_queued_spinlock',
                       'lh_swap_mutex',
                       'lh_tbb_spin_rw_mutex',
                       'lh_ticket_spinlock'],
               'cmd_aarch64': ['lh_hybrid_spinlock',
                               'lh_hybrid_spinlock_fastdequeue'],
               'cmd_x86_64': None,
               'enabled': False,
               'repeat': 9,
               'safemode': False,
               'skipsince': 48,
               'skipstep': 8,
               'sweepargu': 't'},
 'unittest': {'enabled': True,
              'safemode': True,
              'testcase': [{'a': 100,
                            'c': ['0ns', '50ns'],
                            'cmd': ['lh_cas_event_mutex',
                                    'lh_cas_lockref',
                                    'lh_cas_rw_lock',
                                    'lh_empty',
                                    'lh_event_mutex',
                                    'lh_incdec_refcount',
                                    'lh_jvm_objectmonitor',
                                    'lh_osq_lock',
                                    'lh_queued_spinlock',
                                    'lh_swap_mutex',
                                    'lh_tbb_spin_rw_mutex',
                                    'lh_ticket_spinlock'],
                            'cmd_aarch64': ['lh_hybrid_spinlock',
                                            'lh_hybrid_spinlock_fastdequeue'],
                            'cmd_x86_64': None,
                            'p': ['0ns', '50ns'],
                            't': [1, 0]},
                           {'a': 100,
                            'c': '50ns',
                            'cmd': 'lh_osq_lock',
                            'extra': {'s': 2, 'u': 10},
                            'p': '0ns',
                            't': [1, 0]},
                           {'a': 100,
                            'c': '50ns',
                            'cmd': 'lh_tbb_spin_rw_mutex',
                            'extra': {'m': 1, 'r': 4},
                            'p': '0ns',
                            't': [1, 0]}]}}
test_lh_cas_event_mutex-t1-a100-c0ns-p0ns-s (__main__.TestLockHammer) ... ok
test_lh_cas_event_mutex-t1-a100-c0ns-p50ns-s (__main__.TestLockHammer) ... ok
test_lh_cas_event_mutex-t1-a100-c50ns-p0ns-s (__main__.TestLockHammer) ... ok
test_lh_cas_event_mutex-t1-a100-c50ns-p50ns-s (__main__.TestLockHammer) ... ok
test_lh_cas_event_mutex-t64-a100-c0ns-p0ns-s (__main__.TestLockHammer) ... ok
test_lh_cas_event_mutex-t64-a100-c0ns-p50ns-s (__main__.TestLockHammer) ... ok
test_lh_cas_event_mutex-t64-a100-c50ns-p0ns-s (__main__.TestLockHammer) ... ok
test_lh_cas_event_mutex-t64-a100-c50ns-p50ns-s (__main__.TestLockHammer) ... ok
test_lh_cas_lockref-t1-a100-c0ns-p0ns-s (__main__.TestLockHammer) ... ok
test_lh_cas_lockref-t1-a100-c0ns-p50ns-s (__main__.TestLockHammer) ... ok
test_lh_cas_lockref-t1-a100-c50ns-p0ns-s (__main__.TestLockHammer) ... ok
test_lh_cas_lockref-t1-a100-c50ns-p50ns-s (__main__.TestLockHammer) ... ok
test_lh_cas_lockref-t64-a100-c0ns-p0ns-s (__main__.TestLockHammer) ... ok
test_lh_cas_lockref-t64-a100-c0ns-p50ns-s (__main__.TestLockHammer) ... ok
test_lh_cas_lockref-t64-a100-c50ns-p0ns-s (__main__.TestLockHammer) ... ok
test_lh_cas_lockref-t64-a100-c50ns-p50ns-s (__main__.TestLockHammer) ... ok
test_lh_cas_rw_lock-t1-a100-c0ns-p0ns-s (__main__.TestLockHammer) ... ok
test_lh_cas_rw_lock-t1-a100-c0ns-p50ns-s (__main__.TestLockHammer) ... ok
test_lh_cas_rw_lock-t1-a100-c50ns-p0ns-s (__main__.TestLockHammer) ... ok
test_lh_cas_rw_lock-t1-a100-c50ns-p50ns-s (__main__.TestLockHammer) ... ok
test_lh_cas_rw_lock-t64-a100-c0ns-p0ns-s (__main__.TestLockHammer) ... ok
test_lh_cas_rw_lock-t64-a100-c0ns-p50ns-s (__main__.TestLockHammer) ... ok
test_lh_cas_rw_lock-t64-a100-c50ns-p0ns-s (__main__.TestLockHammer) ... ok
test_lh_cas_rw_lock-t64-a100-c50ns-p50ns-s (__main__.TestLockHammer) ... ok
test_lh_empty-t1-a100-c0ns-p0ns-s (__main__.TestLockHammer) ... ok
test_lh_empty-t1-a100-c0ns-p50ns-s (__main__.TestLockHammer) ... ok
test_lh_empty-t1-a100-c50ns-p0ns-s (__main__.TestLockHammer) ... ok
test_lh_empty-t1-a100-c50ns-p50ns-s (__main__.TestLockHammer) ... ok
test_lh_empty-t64-a100-c0ns-p0ns-s (__main__.TestLockHammer) ... ok
test_lh_empty-t64-a100-c0ns-p50ns-s (__main__.TestLockHammer) ... ok
test_lh_empty-t64-a100-c50ns-p0ns-s (__main__.TestLockHammer) ... ok
test_lh_empty-t64-a100-c50ns-p50ns-s (__main__.TestLockHammer) ... ok
test_lh_event_mutex-t1-a100-c0ns-p0ns-s (__main__.TestLockHammer) ... ok
test_lh_event_mutex-t1-a100-c0ns-p50ns-s (__main__.TestLockHammer) ... ok
test_lh_event_mutex-t1-a100-c50ns-p0ns-s (__main__.TestLockHammer) ... ok
test_lh_event_mutex-t1-a100-c50ns-p50ns-s (__main__.TestLockHammer) ... ok
test_lh_event_mutex-t64-a100-c0ns-p0ns-s (__main__.TestLockHammer) ... ok
test_lh_event_mutex-t64-a100-c0ns-p50ns-s (__main__.TestLockHammer) ... ok
test_lh_event_mutex-t64-a100-c50ns-p0ns-s (__main__.TestLockHammer) ... ok
test_lh_event_mutex-t64-a100-c50ns-p50ns-s (__main__.TestLockHammer) ... ok
test_lh_incdec_refcount-t1-a100-c0ns-p0ns-s (__main__.TestLockHammer) ... ok
test_lh_incdec_refcount-t1-a100-c0ns-p50ns-s (__main__.TestLockHammer) ... ok
test_lh_incdec_refcount-t1-a100-c50ns-p0ns-s (__main__.TestLockHammer) ... ok
test_lh_incdec_refcount-t1-a100-c50ns-p50ns-s (__main__.TestLockHammer) ... ok
test_lh_incdec_refcount-t64-a100-c0ns-p0ns-s (__main__.TestLockHammer) ... ok
test_lh_incdec_refcount-t64-a100-c0ns-p50ns-s (__main__.TestLockHammer) ... ok
test_lh_incdec_refcount-t64-a100-c50ns-p0ns-s (__main__.TestLockHammer) ... ok
test_lh_incdec_refcount-t64-a100-c50ns-p50ns-s (__main__.TestLockHammer) ... ok
test_lh_jvm_objectmonitor-t1-a100-c0ns-p0ns-s (__main__.TestLockHammer) ... ok
test_lh_jvm_objectmonitor-t1-a100-c0ns-p50ns-s (__main__.TestLockHammer) ... ok
test_lh_jvm_objectmonitor-t1-a100-c50ns-p0ns-s (__main__.TestLockHammer) ... ok
test_lh_jvm_objectmonitor-t1-a100-c50ns-p50ns-s (__main__.TestLockHammer) ... ok
test_lh_jvm_objectmonitor-t64-a100-c0ns-p0ns-s (__main__.TestLockHammer) ... ok
test_lh_jvm_objectmonitor-t64-a100-c0ns-p50ns-s (__main__.TestLockHammer) ... ok
test_lh_jvm_objectmonitor-t64-a100-c50ns-p0ns-s (__main__.TestLockHammer) ... ok
test_lh_jvm_objectmonitor-t64-a100-c50ns-p50ns-s (__main__.TestLockHammer) ... ok
test_lh_osq_lock-t1-a100-c0ns-p0ns-s (__main__.TestLockHammer) ... ok
test_lh_osq_lock-t1-a100-c0ns-p50ns-s (__main__.TestLockHammer) ... ok
test_lh_osq_lock-t1-a100-c50ns-p0ns-s (__main__.TestLockHammer) ... ok
test_lh_osq_lock-t1-a100-c50ns-p0ns-s---u10-s2 (__main__.TestLockHammer) ... ok
test_lh_osq_lock-t1-a100-c50ns-p50ns-s (__main__.TestLockHammer) ... ok
test_lh_osq_lock-t64-a100-c0ns-p0ns-s (__main__.TestLockHammer) ... ok
test_lh_osq_lock-t64-a100-c0ns-p50ns-s (__main__.TestLockHammer) ... ok
test_lh_osq_lock-t64-a100-c50ns-p0ns-s (__main__.TestLockHammer) ... ok
test_lh_osq_lock-t64-a100-c50ns-p0ns-s---u10-s2 (__main__.TestLockHammer) ... ok
test_lh_osq_lock-t64-a100-c50ns-p50ns-s (__main__.TestLockHammer) ... ok
test_lh_queued_spinlock-t1-a100-c0ns-p0ns-s (__main__.TestLockHammer) ... ok
test_lh_queued_spinlock-t1-a100-c0ns-p50ns-s (__main__.TestLockHammer) ... ok
test_lh_queued_spinlock-t1-a100-c50ns-p0ns-s (__main__.TestLockHammer) ... ok
test_lh_queued_spinlock-t1-a100-c50ns-p50ns-s (__main__.TestLockHammer) ... ok
test_lh_queued_spinlock-t64-a100-c0ns-p0ns-s (__main__.TestLockHammer) ... ok
test_lh_queued_spinlock-t64-a100-c0ns-p50ns-s (__main__.TestLockHammer) ... ok
test_lh_queued_spinlock-t64-a100-c50ns-p0ns-s (__main__.TestLockHammer) ... ok
test_lh_queued_spinlock-t64-a100-c50ns-p50ns-s (__main__.TestLockHammer) ... ok
test_lh_swap_mutex-t1-a100-c0ns-p0ns-s (__main__.TestLockHammer) ... ok
test_lh_swap_mutex-t1-a100-c0ns-p50ns-s (__main__.TestLockHammer) ... ok
test_lh_swap_mutex-t1-a100-c50ns-p0ns-s (__main__.TestLockHammer) ... ok
test_lh_swap_mutex-t1-a100-c50ns-p50ns-s (__main__.TestLockHammer) ... ok
test_lh_swap_mutex-t64-a100-c0ns-p0ns-s (__main__.TestLockHammer) ... ok
test_lh_swap_mutex-t64-a100-c0ns-p50ns-s (__main__.TestLockHammer) ... ok
test_lh_swap_mutex-t64-a100-c50ns-p0ns-s (__main__.TestLockHammer) ... ok
test_lh_swap_mutex-t64-a100-c50ns-p50ns-s (__main__.TestLockHammer) ... ok
test_lh_tbb_spin_rw_mutex-t1-a100-c0ns-p0ns-s (__main__.TestLockHammer) ... ok
test_lh_tbb_spin_rw_mutex-t1-a100-c0ns-p50ns-s (__main__.TestLockHammer) ... ok
test_lh_tbb_spin_rw_mutex-t1-a100-c50ns-p0ns-s (__main__.TestLockHammer) ... ok
test_lh_tbb_spin_rw_mutex-t1-a100-c50ns-p0ns-s---r4-m1 (__main__.TestLockHammer) ... ok
test_lh_tbb_spin_rw_mutex-t1-a100-c50ns-p50ns-s (__main__.TestLockHammer) ... ok
test_lh_tbb_spin_rw_mutex-t64-a100-c0ns-p0ns-s (__main__.TestLockHammer) ... ok
test_lh_tbb_spin_rw_mutex-t64-a100-c0ns-p50ns-s (__main__.TestLockHammer) ... ok
test_lh_tbb_spin_rw_mutex-t64-a100-c50ns-p0ns-s (__main__.TestLockHammer) ... ok
test_lh_tbb_spin_rw_mutex-t64-a100-c50ns-p0ns-s---r4-m1 (__main__.TestLockHammer) ... ok
test_lh_tbb_spin_rw_mutex-t64-a100-c50ns-p50ns-s (__main__.TestLockHammer) ... ok
test_lh_ticket_spinlock-t1-a100-c0ns-p0ns-s (__main__.TestLockHammer) ... ok
test_lh_ticket_spinlock-t1-a100-c0ns-p50ns-s (__main__.TestLockHammer) ... ok
test_lh_ticket_spinlock-t1-a100-c50ns-p0ns-s (__main__.TestLockHammer) ... ok
test_lh_ticket_spinlock-t1-a100-c50ns-p50ns-s (__main__.TestLockHammer) ... ok
test_lh_ticket_spinlock-t64-a100-c0ns-p0ns-s (__main__.TestLockHammer) ... ok
test_lh_ticket_spinlock-t64-a100-c0ns-p50ns-s (__main__.TestLockHammer) ... ok
test_lh_ticket_spinlock-t64-a100-c50ns-p0ns-s (__main__.TestLockHammer) ... ok
test_lh_ticket_spinlock-t64-a100-c50ns-p50ns-s (__main__.TestLockHammer) ... ok

----------------------------------------------------------------------
Ran 100 tests in 44.287s

OK
diff --git a/benchmarks/lockhammer/scripts/lh_test_cfg.yaml b/benchmarks/lockhammer/scripts/lh_test_cfg.yaml
@@ -34,8 +34,8 @@
 
 ## Global Settings
 globalcfg:
-    execdir: /root/synchronization-benchmarks/benchmarks/lockhammer/build
-    logfile: /root/lockhammer.csv
+    execdir: ../build
+    logfile: lockhammer.csv
 
 ## Sweep Test Settings
 #
diff --git a/benchmarks/lockhammer/scripts/test_lockhammer.py b/benchmarks/lockhammer/scripts/test_lockhammer.py
@@ -256,7 +256,7 @@ def generate_unittest(className, lhCfg, testCfg):
         for oneParam in generate_param(testCfg):
             if safeMode:
                 oneParam = insert_safe_flag(oneParam)
-            testExec = os.path.join(execDir, oneCmd)
+            testExec = os.path.join(os.path.dirname(os.path.abspath(__file__)), execDir, oneCmd)
             testFunc = construct_func(testExec, oneParam, logFile)
             fullCmdName = full_func_name(oneCmd, oneParam, False)
             setattr(className, "test_" + fullCmdName, testFunc)
@@ -303,7 +303,7 @@ def generate_sweeptest(className, lhCfg):
                 newOneParam = ['-'+sweepArgu, sweepParam] + oneParam
                 if safeMode:
                     newOneParam = insert_safe_flag(newOneParam)
-                testExec = os.path.join(execDir, oneCmd)
+                testExec = os.path.join(os.path.dirname(os.path.abspath(__file__)), execDir, oneCmd)
                 for rep in range(repeatCnt):
                     testFunc = construct_func(testExec, newOneParam, logFile)
                     fullCmdName = full_func_name(oneCmd, newOneParam + ['-'+str(rep)], True)

Original file line number	Diff line number	Diff line change
`@@ -34,8 +34,8 @@`
`34`	`34`
`35`	`35`	`## Global Settings`
`36`	`36`	`globalcfg:`
`37`		`- execdir: /root/synchronization-benchmarks/benchmarks/lockhammer/build`
`38`		`- logfile: /root/lockhammer.csv`
	`37`	`+ execdir: ../build`
	`38`	`+ logfile: lockhammer.csv`
`39`	`39`
`40`	`40`	`## Sweep Test Settings`
`41`	`41`	`#`