Merge pull request #167 from yast/coreutils-cat

adjust testsuite to pass also with newer coreutils-9.6

Author: mvidner

agent-system/testsuite/tests/bash.err

@@ -1,3 +1,3 @@
-[bash] ShellCommand.cc(shellcommand):78 /bin/cat: tests/missing: No such file or directory
-[bash] ShellCommand.cc(shellcommand):78 /bin/cat: tests/missing: No such file or directory
-[bash] ShellCommand.cc(shellcommand):78 /bin/cat: tests/missing: No such file or directory
+[bash] ShellCommand.cc(shellcommand):78 cat: tests/missing: No such file or directory
+[bash] ShellCommand.cc(shellcommand):78 cat: tests/missing: No such file or directory
+[bash] ShellCommand.cc(shellcommand):78 cat: tests/missing: No such file or directory

agent-system/testsuite/tests/bash.out

@@ -5,7 +5,7 @@
 (1)
 ($["exit":0, "stderr":"", "stdout":""])
 ($["exit":0, "stderr":"", "stdout":"Software is like sex. It's better when it's free.\n"])
-($["exit":1, "stderr":"/bin/cat: tests/missing: No such file or directory\n", "stdout":""])
+($["exit":1, "stderr":"cat: tests/missing: No such file or directory\n", "stdout":""])
 ($["exit":42, "stderr":"", "stdout":"life\n"])
 (true)
 (true)

agent-system/testsuite/tests/bash.ycp

@@ -15,7 +15,7 @@
 }
 
 {
-    return SCR::Execute (.bash, "/bin/cat tests/missing");
+    return SCR::Execute (.bash, "cat tests/missing");
 }
 
 {
@@ -27,7 +27,7 @@
 }
 
 {
-    return SCR::Execute (.bash_output, "/bin/cat tests/missing");
+    return SCR::Execute (.bash_output, "cat tests/missing");
 }
 
 {
@@ -47,7 +47,7 @@
 }
 
 {
-    any ret = SCR::Execute (.bash_background, "/bin/cat tests/missing") == 0;
+    any ret = SCR::Execute (.bash_background, "cat tests/missing") == 0;
     sleep(1000);
     return ret;
 }

libycp/src/YCPList.cc

@@ -23,6 +23,7 @@
 #include "ycp/y2log.h"
 #include "ycp/YCPList.h"
 #include <algorithm>
+#include <functional>
 #include "ycp/Bytecode.h"
 #include "ycp/Xmlcode.h"
 #include "ycp/YCPCodeCompare.h"
@@ -115,7 +116,8 @@ YCPListRep::swap (int x, int y)
 
 bool YCPListRep::contains (const YCPValue& value) const
 {
-    return find_if(begin(), end(), bind2nd(ycp_equal_to(), value)) != end();
+    using namespace std::placeholders;
+    return find_if(begin(), end(), std::bind(ycp_equal_to(), _1, value)) != end();
 }
 
 

libycp/src/include/ycp/YCPCodeCompare.h

@@ -28,7 +28,7 @@
  *  "sort (`a, `b, l, ``( a[0] < b[0] ))"
  * Passed to std::sort
  */
-class YCPCodeCompare : public std::binary_function <const YCPValue &, const YCPValue &, bool>
+class YCPCodeCompare
 {
 private:
     SymbolEntryPtr se1;
@@ -44,8 +44,8 @@ class YCPCodeCompare : public std::binary_function <const YCPValue &, const YCPV
 	{
 	}
 
-    result_type operator () (first_argument_type a,
-			     second_argument_type b)
+    bool operator () (const YCPValue & a,
+                      const YCPValue & b)
 	{
 	    se1->setValue (a);
 	    se2->setValue (b);

libycp/src/include/ycp/ycpless.h

@@ -32,7 +32,7 @@
  * Compares two YCPValues and returns true if the first value is less than the
  * second one, false otherwise. Optionally the comparison is locale aware.
  */
-class ycp_less : public std::binary_function<YCPValue, YCPValue, bool>
+class ycp_less
 {
 
 public:
@@ -57,7 +57,7 @@ class ycp_less : public std::binary_function<YCPValue, YCPValue, bool>
  * Compares two YCPValues and returns true if they are equal, false otherwise.
  * Optionally the comparison is locale aware.
  */
-class ycp_equal_to : public std::binary_function<YCPValue, YCPValue, bool>
+class ycp_equal_to
 {
 
 public:
@@ -82,7 +82,7 @@ class ycp_equal_to : public std::binary_function<YCPValue, YCPValue, bool>
  * Compares two YCPValues and returns true if they are not equal, false
  * otherwise.  Optionally the comparison is locale aware.
  */
-class ycp_not_equal_to : public std::binary_function<YCPValue, YCPValue, bool>
+class ycp_not_equal_to
 {
 
 public:

package/yast2-core.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Mon Jan 20 10:41:17 UTC 2025 - Martin Vidner <mvidner@suse.com>
+
+- adjust testsuite to pass also with newer coreutils-9.6
+  (gh#yast/yast-core#167)
+- Stop using std::binary_function, deprecated since C++11
+- 5.0.3.
+
 -------------------------------------------------------------------
 Wed Jan 10 16:22:03 UTC 2024 - Martin Vidner <mvidner@suse.com>
 

package/yast2-core.spec

@@ -26,7 +26,7 @@
 %bcond_with werror
 
 Name:           yast2-core
-Version:        5.0.2
+Version:        5.0.3
 Release:        0
 Url:            https://github.com/yast/yast-core