From 33f841eba0667c770c3a79c1af36444ecdffca67 Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Tue, 3 Mar 2020 16:28:33 +0300
Subject: Revert previous (erroneously pushed to master) commit

---
 tests/link/driver.cxx       | 43 ++++++++++++-------------------------------
 tests/mventry/testscript    |  5 ++---
 tests/path-entry/driver.cxx | 22 +++-------------------
 tests/path-entry/testscript |  9 ---------
 4 files changed, 17 insertions(+), 62 deletions(-)

(limited to 'tests')

diff --git a/tests/link/driver.cxx b/tests/link/driver.cxx
index 79f381d..96ac880 100644
--- a/tests/link/driver.cxx
+++ b/tests/link/driver.cxx
@@ -35,33 +35,18 @@ using namespace butl;
 
 static const char text[] = "ABCDEF";
 
-enum class mklink
-{
-  sym,
-  hard,
-  any
-};
-
 static bool
-link_file (const path& target, const path& link, mklink ml, bool check_content)
+link_file (const path& target, const path& link, bool hard, bool check_content)
 {
   try
   {
-    switch (ml)
-    {
-    case mklink::sym:  mksymlink  (target, link);                  break;
-    case mklink::hard: mkhardlink (target, link);                  break;
-    case mklink::any:  mkanylink  (target, link, true /* copy */); break;
-    }
-  }
-  catch (const system_error& e)
-  {
-    cerr << e << endl;
-    return false;
+    if (hard)
+      mkhardlink (target, link);
+    else
+      mksymlink (target, link);
   }
-  catch (const pair<entry_type, system_error>& e)
+  catch (const system_error&)
   {
-    cerr << e.second << endl;
     return false;
   }
 
@@ -154,26 +139,22 @@ main ()
 
   // Create the file hard link.
   //
-  assert (link_file (fp, td / path ("hlink"), mklink::hard, true));
+  assert (link_file (fp, td / path ("hlink"), true, true));
 
 #ifndef _WIN32
   // Create the file symlink using an absolute path.
   //
-  assert (link_file (fp, td / path ("slink"), mklink::sym, true));
+  assert (link_file (fp, td / path ("slink"), false, true));
 
   // Create the file symlink using a relative path.
   //
-  assert (link_file (fn, td / path ("rslink"), mklink::sym, true));
+  assert (link_file (fn, td / path ("rslink"), false, true));
 
   // Create the file symlink using an unexistent file path.
   //
-  assert (link_file (fp + "-a", td / path ("sa"), mklink::sym, false));
+  assert (link_file (fp + "-a", td / path ("sa"), false, false));
 #endif
 
-  // Create the file any link.
-  //
-  assert (link_file (fp, td / path ("alink"), mklink::any, true));
-
   // Prepare the target directory.
   //
   dir_path dn ("dir");
@@ -188,8 +169,8 @@ main ()
   }
 
 #ifndef _WIN32
-  assert (link_file (fp, dp / path ("hlink"), mklink::hard, true));
-  assert (link_file (fp, dp / path ("slink"), mklink::sym, true));
+  assert (link_file (fp, dp / path ("hlink"), true, true));
+  assert (link_file (fp, dp / path ("slink"), false, true));
 #endif
 
   // Create the directory symlink using an absolute path.
diff --git a/tests/mventry/testscript b/tests/mventry/testscript
index 8c41eb4..ecd617a 100644
--- a/tests/mventry/testscript
+++ b/tests/mventry/testscript
@@ -130,7 +130,7 @@ if ($test.target == $build.host)
       : target stays intact.
       :
       echo 'foo' >=a;
-      $lns &b;
+      $lns;
       echo 'bar' >=c &!c;
       $* c b;
       cat a >'foo';
@@ -149,7 +149,6 @@ if ($test.target == $build.host)
     : dir
     :
     {
-#\
       : from
       :
       : Make sure that if source is a symlink it refers the same target after
@@ -161,7 +160,7 @@ if ($test.target == $build.host)
       touch a/b;
       test -f c/b;
       test -d b == 1
-#\
+
       : to
       :
       : Make sure that if destination is a symlink it is get overwritten and
diff --git a/tests/path-entry/driver.cxx b/tests/path-entry/driver.cxx
index e4dddf3..d48bf49 100644
--- a/tests/path-entry/driver.cxx
+++ b/tests/path-entry/driver.cxx
@@ -25,36 +25,20 @@ import butl.filesystem;
 using namespace std;
 using namespace butl;
 
-// Usage: argv[0] [-l] <path>
+// Usage: argv[0] <path>
 //
 // If path entry exists then print it's type and size (meaningful for the
 // regular file only) to STDOUT, and exit with the zero code. Otherwise exit
 // with the one code. Don't follow symlink. On failure print the error
 // description to STDERR and exit with the two code.
 //
-// -l
-//    Follow symlinks.
-//
 int
 main (int argc, const char* argv[])
 try
 {
-  bool follow_symlinks (false);
-
-  int i (1);
-  for (; i != argc; ++i)
-  {
-    string v (argv[i]);
-
-    if (v == "-l")
-      follow_symlinks = true;
-    else
-      break;
-  }
-
-  assert (i == argc - 1);
+  assert (argc == 2);
 
-  auto es (path_entry (argv[i], follow_symlinks));
+  auto es (path_entry (argv[1]));
 
   if (!es.first)
     return 1;
diff --git a/tests/path-entry/testscript b/tests/path-entry/testscript
index 35b6f6f..456f96f 100644
--- a/tests/path-entry/testscript
+++ b/tests/path-entry/testscript
@@ -25,15 +25,6 @@
   directory
   /.
   EOO
-
-  : followed-symlink
-  :
-  cat <:'abc' >=f;
-  ln -s f l;
-  $* -l l >>EOO
-  regular
-  3
-  EOO
 }
 
 : non-existent
-- 
cgit v1.1