Fix Makefile mismerge and IPS manifest of OS-5585 and OS-5591
OS-5591 Double flock(3C) causes undue block
OS-5585 fcntl(F_OFD_GETLK) should return EINVAL on bad parameters
Reviewed by: Jerry Jelinek <jerry.jelinek@joyent.com>
Reviewed by: Patrick Mooney <patrick.mooney@joyent.com>
Approved by: Robert Mustacchi <rm@joyent.com>

          --- old/usr/src/pkg/manifests/system-test-ostest.mf
          +++ new/usr/src/pkg/manifests/system-test-ostest.mf

   1    1  #
   2    2  # This file and its contents are supplied under the terms of the
   3    3  # Common Development and Distribution License ("CDDL"), version 1.0.
   4    4  # You may only use this file in accordance with the terms of version
   5    5  # 1.0 of the CDDL.
   6    6  #
   7    7  # A full copy of the text of the CDDL should have accompanied this
   8    8  # source.  A copy of the CDDL is also available via the Internet at
   9    9  # http://www.illumos.org/license/CDDL.
  10   10  #
  11   11  
  12   12  #
  13   13  # Copyright (c) 2012 by Delphix. All rights reserved.
  14   14  # Copyright 2014, OmniTI Computer Consulting, Inc. All rights reserved.
  15   15  #
  16   16  

  17   17  set name=pkg.fmri value=pkg:/system/test/ostest@$(PKGVERS)
  18   18  set name=pkg.description value="Miscellaneous OS Unit Tests"
  19   19  set name=pkg.summary value="OS Unit Test Suite"
  20   20  set name=info.classification \
  21   21      value=org.opensolaris.category.2008:Development/System
  22   22  set name=variant.arch value=$(ARCH)
  23   23  dir path=opt/os-tests
  24   24  dir path=opt/os-tests/bin
  25   25  dir path=opt/os-tests/runfiles
  26   26  dir path=opt/os-tests/tests
       27 +dir path=opt/os-tests/tests/file-locking
  27   28  dir path=opt/os-tests/tests/sigqueue
  28   29  file path=opt/os-tests/README mode=0444
  29   30  file path=opt/os-tests/bin/ostest mode=0555
  30   31  file path=opt/os-tests/runfiles/delphix.run mode=0444
  31   32  file path=opt/os-tests/runfiles/omnios.run mode=0444
  32   33  file path=opt/os-tests/runfiles/openindiana.run mode=0444
       34 +file path=opt/os-tests/tests/file-locking/acquire-lock.32 mode=0555
       35 +file path=opt/os-tests/tests/file-locking/acquire-lock.64 mode=0555
       36 +file path=opt/os-tests/tests/file-locking/runtests.32 mode=0555
       37 +file path=opt/os-tests/tests/file-locking/runtests.64 mode=0555
  33   38  file path=opt/os-tests/tests/poll_test mode=0555
  34   39  file path=opt/os-tests/tests/sigqueue/sigqueue_queue_size mode=0555
  35   40  file path=opt/os-tests/tests/spoof-ras mode=0555
  36   41  license cr_Sun license=cr_Sun
  37   42  license lic_CDDL license=lic_CDDL
  38   43  depend fmri=system/test/testrunner type=require
    

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX