From: Joseph Sutton <josephsutton@catalyst.net.nz>
Date: Wed, 14 Apr 2021 22:32:41 +0000 (+1200)
Subject: Revert "s4-test: fixed ndrdump test for top level build"
X-Git-Tag: tevent-0.11.0~819
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6f144d49b5281a08bf7be550b949f4d91e8fe19b;p=thirdparty%2Fsamba.git

Revert "s4-test: fixed ndrdump test for top level build"

This essentially reverts commit
b84c0a9ed6d556eb2d3797d606edcd03f9766606, but the datapath is now in the
source4 directory.

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
---

diff --git a/python/samba/tests/blackbox/ndrdump.py b/python/samba/tests/blackbox/ndrdump.py
index 91ac076fd3a..82cb1275070 100644
--- a/python/samba/tests/blackbox/ndrdump.py
+++ b/python/samba/tests/blackbox/ndrdump.py
@@ -24,13 +24,7 @@ import os
 import re
 from samba.tests import BlackboxTestCase, BlackboxProcessError
 
-for p in ["../../../../../source4/librpc/tests",
-          "../../../../../librpc/tests"]:
-    data_path_dir = os.path.abspath(os.path.join(os.path.dirname(__file__), p))
-    print(data_path_dir)
-    if os.path.exists(data_path_dir):
-        break
-
+data_path_dir = os.path.abspath(os.path.join(os.path.dirname(__file__), "../../../../../source4/librpc/tests"))
 
 class NdrDumpTests(BlackboxTestCase):
     """Blackbox tests for ndrdump."""